Cleanup and fix issue and complete the implementation

Author: SOHELAHMED7

src/spec/SecurityRequirements.php

@@ -24,7 +24,7 @@ public function __construct(array $data)
         parent::__construct($data);
 
         $read = true;
-        foreach($data as $index => $value) {
+        foreach ($data as $index => $value) {
             if (is_numeric($index)) { // read
                 $requirements = $value;
                 $this->_securityRequirements[array_keys($value)[0]] = new SecurityRequirement(array_values($value)[0]);
@@ -34,6 +34,9 @@ public function __construct(array $data)
                 $this->_securityRequirements[$index] = $value;
             }
         }
+        if ($data === []) {
+            $this->_securityRequirements = [];
+        }
     }
 
     /**
@@ -71,6 +74,11 @@ public function getSerializableData()
 
     public function getRequirement(string $name)
     {
-        return $this->_securityRequirements[$name] ?? 'nul5l';
+        return $this->_securityRequirements[$name] ?? null;
+    }
+
+    public function getRequirements()
+    {
+        return $this->_securityRequirements;
     }
 }

src/spec/SecurityScheme.php

@@ -25,22 +25,13 @@
  */
 class SecurityScheme extends SpecBaseObject
 {
-    public $name;
-    public $scheme;
     private $knownTypes = [
         "apiKey",
         "http",
         "oauth2",
         "openIdConnect"
     ];
 
-    public function __construct(array $data)
-    {
-        parent::__construct($data);
-        $this->name = array_keys($data)[0];
-        $this->scheme = array_values($data)[0];
-    }
-
     /**
      * @return array array of attributes available in this object.
      */

src/spec/SecuritySchemes.php

@@ -8,7 +8,6 @@
 use cebe\openapi\spec\SecurityRequirement;
 use cebe\openapi\spec\SecurityRequirements;
 use cebe\openapi\spec\SecurityScheme;
-use cebe\openapi\spec\SecuritySchemes;
 
 class WriterTest extends \PHPUnit\Framework\TestCase
 {
@@ -204,13 +203,13 @@ public function testSecurityAtPathOperationLevel()
     {
         $openapi = $this->createOpenAPI([
             'components' => new Components([
-                'securitySchemes' => new SecuritySchemes([
+                'securitySchemes' => [
                     'BearerAuth' => new SecurityScheme([
                         'type' => 'http',
                         'scheme' => 'bearer',
                         'bearerFormat' => 'AuthToken and JWT Format' # optional, arbitrary value for documentation purposes
                     ]),
-                ]),
+                ],
             ]),
             'paths' => [
                 '/test' => new PathItem([

tests/WriterTest.php

@@ -199,10 +199,10 @@ public function testDefaultSecurity()
 YAML
         );
 
-        $this->assertSame([], $openapi->paths->getPath('/path/one')->post->security);
+        $this->assertSame([], $openapi->paths->getPath('/path/one')->post->security->getRequirements());
         $this->assertSame(null, $openapi->paths->getPath('/path/two')->post->security);
 
-        $this->assertCount(1, $openapi->security);
-        $this->assertSame([], $openapi->security[0]->Bearer);
+        $this->assertCount(1, $openapi->security->getRequirements());
+        $this->assertSame([], $openapi->security->getRequirement('Bearer')->getSerializableData());
     }
 }