Applied fixes from StyleCI

phramework · Feb 5, 2016 · 5a0798a · 5a0798a
1 parent 0983044
commit 5a0798a
Show file tree

Hide file tree

Showing 15 changed files with 6 additions and 25 deletions.
diff --git a/src/Fields.php b/src/Fields.php
@@ -146,7 +146,7 @@ public static function parseFromParameters($parameters, $primaryResourceModelCla
             if ($primaryResourceModelClass::getType() == $resourceType) {
                 //check if $resourceType allowed (primary)
                 $modelClass = $primaryResourceModelClass;
-            } else if($primaryResourceModelClass::relationshipExists($resourceType)) {
+            } elseif ($primaryResourceModelClass::relationshipExists($resourceType)) {
                 //check if $resourceType allowed (primary's relationships)
                 $modelClass = $primaryResourceModelClass::getRelationship($resourceType)->modelClass;
             } else {

diff --git a/src/Filter.php b/src/Filter.php
@@ -114,7 +114,6 @@ public function __construct(
                     $relationshipKey
                 ));
             }
-
         }
 
         if (!Util::isArrayOf($filterAttributes, FilterAttribute::class)) {
@@ -193,7 +192,6 @@ public function validate($modelClass)
         $filterable = $modelClass::getFilterable();
 
         foreach ($this->attributes as $filterAttribute) {
-
             $isJSONFilter = ($filterAttribute instanceof FilterJSONAttribute);
 
             if (!property_exists($filterable, $filterAttribute->attribute)) {
@@ -316,7 +314,6 @@ public static function parseFromParameters($parameters, $modelClass)
         $filterAttributes    = [];
 
         foreach ($parameters->filter as $filterKey => $filterValue) {
-
             if ($filterKey === $modelClass::getType()) { //Filter primary data
                 //Check filter value type
                 if (!is_string($filterValue) && !is_integer($filterValue)) {

diff --git a/src/Model/Directives.php b/src/Model/Directives.php
@@ -205,7 +205,6 @@ protected static function handleFilter(
         $additionalQuery = [];
 
         if ($filter !== null) {
-
             $filter->validate(static::class);
 
             if (count($filter->primary)) {
@@ -297,7 +296,7 @@ protected static function handleFilter(
                         Operator::OPERATOR_NOT_IN_ARRAY => '= ANY' // External not
                     ];
 
-                    $additionalQuery[] = sprintf( //$operand ANY (array)
+                    $additionalQuery[] = sprintf(//$operand ANY (array)
                         '%s %s (\'%s\' %s("%s"."%s")) ',
                         ($hasWhere ? 'AND' : 'WHERE'),
                         (
@@ -367,7 +366,6 @@ protected static function handleFilter(
 
             //Apply filters only for JSON attributes
             foreach ($filter->attributes as $filterValue) {
-
                 if (!($filterValue instanceof FilterJSONAttribute)) {
                     continue;
                 }

diff --git a/src/Resource.php b/src/Resource.php
@@ -157,10 +157,10 @@ public static function parseFromRecord(
             return null;
         }
 
-        $flagAttributes              = ($flags & Resource::PARSE_ATTRIBUTES             ) != 0;
-        $flagLinks                   = ($flags & Resource::PARSE_LINKS                  ) != 0;
-        $flagRelationships           = ($flags & Resource::PARSE_RELATIONSHIP           ) != 0;
-        $flagRelationshipsLinks      = ($flags & Resource::PARSE_RELATIONSHIP_LINKS     ) != 0;
+        $flagAttributes              = ($flags & Resource::PARSE_ATTRIBUTES) != 0;
+        $flagLinks                   = ($flags & Resource::PARSE_LINKS) != 0;
+        $flagRelationships           = ($flags & Resource::PARSE_RELATIONSHIP) != 0;
+        $flagRelationshipsLinks      = ($flags & Resource::PARSE_RELATIONSHIP_LINKS) != 0;
 
         //Work with objects
         if (!is_object($record) && is_array($record)) {
@@ -220,7 +220,6 @@ public static function parseFromRecord(
 
                 //Attach relationship links
                 if ($flagRelationshipsLinks) {
-
                     $relationshipEntry->links = [
                         'self' => $modelClass::getSelfLink(
                             $resource->id . '/relationships/' . $relationshipKey
@@ -258,7 +257,6 @@ public static function parseFromRecord(
                 };
 
                 if ($relationshipType == Relationship::TYPE_TO_ONE) {
-
                     $relationshipEntryResource = null;
 
                     if (isset($record->{$recordDataAttribute}) && $record->{$recordDataAttribute}) { //preloaded

diff --git a/src/Sort.php b/src/Sort.php
@@ -117,7 +117,6 @@ public static function parseFromParameters($parameters, $modelClass)
                     ? false
                     : true
                 );
-
             } else {
                 throw new RequestException(
                     'Invalid value for sort'

diff --git a/tests/src/ControllerTest.php b/tests/src/ControllerTest.php
@@ -39,7 +39,6 @@ protected function setUp()
      */
     protected function tearDown()
     {
-
     }
 
     public function testExtends()

diff --git a/tests/src/Controllers/DELETETest.php b/tests/src/Controllers/DELETETest.php
@@ -42,7 +42,6 @@ class DELETETest extends \PHPUnit_Framework_TestCase
      */
     protected function setUp()
     {
-
     }
 
     protected function prepare()

diff --git a/tests/src/Controllers/GETByIdTest.php b/tests/src/Controllers/GETByIdTest.php
@@ -42,7 +42,6 @@ class GETByIdTest extends \PHPUnit_Framework_TestCase
      */
     protected function setUp()
     {
-
     }
 
     protected function prepare()

diff --git a/tests/src/Controllers/GETTest.php b/tests/src/Controllers/GETTest.php
@@ -38,7 +38,6 @@ class GETTest extends \PHPUnit_Framework_TestCase
      */
     protected function setUp()
     {
-
     }
 
     protected function prepare()

diff --git a/tests/src/Controllers/PATCHTest.php b/tests/src/Controllers/PATCHTest.php
@@ -41,7 +41,6 @@ class PATCHTest extends \PHPUnit_Framework_TestCase
      */
     protected function setUp()
     {
-
     }
 
     protected function prepare()

diff --git a/tests/src/Controllers/POSTTest.php b/tests/src/Controllers/POSTTest.php
@@ -43,7 +43,6 @@ class POSTTest extends \PHPUnit_Framework_TestCase
      */
     protected function setUp()
     {
-
     }
 
     protected function prepare()

diff --git a/tests/src/Controllers/RelationshipsTest.php b/tests/src/Controllers/RelationshipsTest.php
@@ -42,7 +42,6 @@ class RelationshipsTest extends \PHPUnit_Framework_TestCase
      */
     protected function setUp()
     {
-
     }
 
     protected function prepare()

diff --git a/tests/src/FilterTest.php b/tests/src/FilterTest.php
@@ -203,7 +203,6 @@ public function testParseFromParameters()
         $found2 = false;
 
         foreach ($filter->attributes as $filterAttribute) {
-
             if ($shouldContain1 == $filterAttribute) {
                 $found1 = true;
             } elseif ($shouldContain2 == $filterAttribute) {

diff --git a/tests/src/Model/CacheTest.php b/tests/src/Model/CacheTest.php
@@ -52,7 +52,6 @@ protected function get($limit = 1, $offset = 0)
      */
     public function testInitializeCache()
     {
-
         Bootstrap::invokeStaticMethod(
             Article::class,
             'getCache',

diff --git a/tests/src/ModelTest.php b/tests/src/ModelTest.php
@@ -119,7 +119,6 @@ public function testGetSortable($modelClass)
 
         $this->assertInternalType('array', $fields);
         $this->assertTrue(Util::isArrayOf($fields, 'string'));
-
     }
 
     /**
@@ -133,7 +132,6 @@ public function testGetFields($modelClass)
 
         $this->assertInternalType('array', $fields);
         $this->assertTrue(Util::isArrayOf($fields, 'string'));
-
     }
 
     /**