Updated changelog + PSR2 formatting

zircote · May 12, 2017 · 2f2482f · 2f2482f
1 parent 0a828d4
commit 2f2482f
Show file tree

Hide file tree

Showing 21 changed files with 8 additions and 28 deletions.
diff --git a/Changelog.md b/Changelog.md
@@ -1,7 +1,7 @@
 # Changelog
 
 ## 2.0.10
- - Fix errors when parsing php7 anonymous class #380
+ - Fix errors when parsing php7 anonymous class #380, #390
  - Added support for linked files and directories #393
  - Added support for $ref in deserialize() #369
  - Misc documentation tweaks.

diff --git a/src/Annotations/AbstractAnnotation.php b/src/Annotations/AbstractAnnotation.php
@@ -348,7 +348,7 @@ public function validate($parents = [], $skip = [])
             $keyField = $nested[1];
             foreach ($this->$property as $key => $item) {
                 if (is_array($item) && is_numeric($key) === false) {
-                    Logger::notice($this->identity() . '->' . $property . ' is set to an object, use nested @' . str_replace('Swagger\\Annotations\\', 'SWG\\', $annotationClass) . ' annotation(s) in ' . $this->_context);
+                    Logger::notice($this->identity() . '->' . $property . ' is an object literal, use nested @' . str_replace('Swagger\\Annotations\\', 'SWG\\', $annotationClass) . '() annotation(s) in ' . $this->_context);
                     $keys[$key] = $item;
                 } elseif (empty($item->$keyField)) {
                     Logger::notice($item->identity() . ' is missing key-field: "' . $keyField . '" in ' . $item->_context);

diff --git a/src/Processors/HandleReferences.php b/src/Processors/HandleReferences.php
@@ -178,7 +178,7 @@ private function mapReferences()
 
                 if (!isset($item->ref)) {
                     $this->head_references[$import_name][] = &$data;
-                } else if ($this->checkSyntax($item->ref)) {
+                } elseif ($this->checkSyntax($item->ref)) {
                     $params = explode("/", $item->ref);
 
                     $this->loadParent($data, strtolower($params[1]), $params[2]);
@@ -261,10 +261,10 @@ private function iterateQueue(&$queue, $current_key)
                         }
                         $this->importSchema($value, $response->schema);
                     }
-                } else if ($key != "response") {
+                } elseif ($key != "response") {
                     if (is_array($value)) {
                         $response->$key = array_merge($response->$key?: [], $parent_response->$key);
-                    } else if (!isset($response->$key) && $key != $current_key) {
+                    } elseif (!isset($response->$key) && $key != $current_key) {
                         $response->$key = $parent_response->$key;
                     }
                 }

diff --git a/tests/AbstractAnnotationTest.php b/tests/AbstractAnnotationTest.php
@@ -8,7 +8,6 @@
 
 class AbstractAnnotationTest extends SwaggerTestCase
 {
-
     public function testVendorFields()
     {
         $annotations = $this->parseComment('@SWG\Get(x={"internal-id": 123})');

diff --git a/tests/AnalyserTest.php b/tests/AnalyserTest.php
@@ -11,7 +11,6 @@
 
 class AnalyserTest extends SwaggerTestCase
 {
-
     public function testParseContents()
     {
         $annotations = $this->parseComment('@SWG\Parameter(description="This is my parameter")');

diff --git a/tests/AnalysisTest.php b/tests/AnalysisTest.php
@@ -11,7 +11,6 @@
 
 class AnalysisTest extends SwaggerTestCase
 {
-
     public function testRegisterProcessor()
     {
         $counter = 0;

diff --git a/tests/AugmentDefinitionsTest.php b/tests/AugmentDefinitionsTest.php
@@ -12,7 +12,6 @@
 
 class AugmentDefinitionsTest extends SwaggerTestCase
 {
-
     public function testAugmentDefinitions()
     {
         $analyser = new StaticAnalyser();

diff --git a/tests/AugmentOperationTest.php b/tests/AugmentOperationTest.php
@@ -11,7 +11,6 @@
 
 class AugmentOperationTest extends SwaggerTestCase
 {
-
     public function testAugmentOperation()
     {
         $analyser = new StaticAnalyser();

diff --git a/tests/AugmentParameterTest.php b/tests/AugmentParameterTest.php
@@ -8,7 +8,6 @@
 
 class AugmentParameterTest extends SwaggerTestCase
 {
-
     public function testAugmentParameter()
     {
         $swagger = \Swagger\scan(__DIR__ . '/Fixtures/UsingRefs.php');

diff --git a/tests/AugmentPropertiesTest.php b/tests/AugmentPropertiesTest.php
@@ -13,7 +13,6 @@
 
 class AugmentPropertiesTest extends SwaggerTestCase
 {
-
     public function testAugmentProperties()
     {
         $analyser = new StaticAnalyser();

diff --git a/tests/BuildPathsTest.php b/tests/BuildPathsTest.php
@@ -16,7 +16,6 @@
 
 class BuildPathsTest extends SwaggerTestCase
 {
-
     public function testMergePathsWithSamePath()
     {
         $swagger = new Swagger([]);

diff --git a/tests/CleanUnmergedTest.php b/tests/CleanUnmergedTest.php
@@ -13,7 +13,6 @@
 
 class CleanUnmergedTest extends SwaggerTestCase
 {
-
     public function testCleanUnmergedProcessor()
     {
         $comment = <<<END

diff --git a/tests/CommandlineInterfaceTest.php b/tests/CommandlineInterfaceTest.php
@@ -8,7 +8,6 @@
 
 class CommandlineInterfaceTest extends SwaggerTestCase
 {
-
     protected function setUp()
     {
         if (defined('HHVM_VERSION')) {

diff --git a/tests/ContextTest.php b/tests/ContextTest.php
@@ -10,7 +10,6 @@
 
 class ContextTest extends SwaggerTestCase
 {
-
     public function testDetect()
     {
         $context = Context::detect();

diff --git a/tests/Fixtures/php7.php b/tests/Fixtures/php7.php
@@ -2,17 +2,14 @@
 
 namespace SwaggerFixures;
 
-$o = new class
-{
+$o = new class {
     public function foo()
     {
     }
 };
 
-$o = new class extends stdClass
-{
+$o = new class extends stdClass {
 };
 
-$o = new class implements foo
-{
+$o = new class implements foo {
 };
diff --git a/tests/InheritPropertiesTest.php b/tests/InheritPropertiesTest.php
@@ -15,7 +15,6 @@
 
 class InheritPropertiesTest extends SwaggerTestCase
 {
-
     public function testInheritProperties()
     {
         $analyser = new StaticAnalyser();

diff --git a/tests/ItemsTest.php b/tests/ItemsTest.php
@@ -8,7 +8,6 @@
 
 class ItemsTest extends SwaggerTestCase
 {
-
     public function testTypeArray()
     {
         $annotations = $this->parseComment('@SWG\Items(type="array")');

diff --git a/tests/MergeIntoSwaggerTest.php b/tests/MergeIntoSwaggerTest.php
@@ -13,7 +13,6 @@
 
 class MergeIntoSwaggerTest extends SwaggerTestCase
 {
-
     public function testProcessor()
     {
         $swagger = new Swagger([]);

diff --git a/tests/NestedPropertyTest.php b/tests/NestedPropertyTest.php
@@ -13,7 +13,6 @@
 
 class NestedPropertyTest extends SwaggerTestCase
 {
-
     public function testNestedProperties()
     {
         $analyser = new StaticAnalyser();

diff --git a/tests/ResponseTest.php b/tests/ResponseTest.php
@@ -8,7 +8,6 @@
 
 class ResponseTest extends SwaggerTestCase
 {
-
     public function testMisspelledDefault()
     {
         $annotations = $this->parseComment('@SWG\Get(@SWG\Response(response="Default", description="description"))');

diff --git a/tests/UtilTest.php b/tests/UtilTest.php
@@ -10,7 +10,6 @@
 
 class UtilTest extends SwaggerTestCase
 {
-
     public function testExclude()
     {
         $swagger = \Swagger\scan(__DIR__ . '/Fixtures', ['exclude' => ['Customer.php', 'UsingRefs.php', 'UsingPhpDoc.php', 'GrandAncestor.php']]);
-Original file line number
+Diff line change
@@ Expand Up / @@ -8,7 +8,6 @@ @@
     class AbstractAnnotationTest extends SwaggerTestCase
     {
         public function testVendorFields()
         {
             $annotations = $this->parseComment('@SWG\Get(x={"internal-id": 123})');
@@ Expand Down @@