Fix codestyle

src/Controller/Controller.php

@@ -1,6 +1,6 @@
 <?php
 declare(strict_types=1);
-/**
+/*
  * Copyright 2015-2016 Xenofon Spafaridis
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -220,8 +220,7 @@ function ($d) {
 
             if ($parsed !== null) {
                 //overwrite
-                if (
-                    $overwrite
+                if ($overwrite
                     && (
                     $key = array_search(
                         $directiveClass,

src/Controller/Delete.php

@@ -1,6 +1,6 @@
 <?php
 declare(strict_types=1);
-/**
+/*
  * Copyright 2015-2016 Xenofon Spafaridis
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -41,7 +41,7 @@ public static function handleDelete(
         array $validationCallbacks = [],
         callable $viewCallback = null,
         int $bulkLimit = null,
-        array $directives
+        array $directives = []
     ) : ResponseInterface {
         //Validate id using model's validator
         $id = $model->getIdAttributeValidator()->parse($id);
@@ -63,4 +63,4 @@ public static function handleDelete(
 
         //204 or view callback
     }
-}
+}

src/Controller/Get.php

@@ -1,6 +1,6 @@
 <?php
 declare(strict_types=1);
-/**
+/*
  * Copyright 2015-2016 Xenofon Spafaridis
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -48,8 +48,7 @@ public static function handleGet(
         ResponseInterface $response,
         ResourceModel $model,
         array $directives = []
-    ) : ResponseInterface
-    {
+    ) : ResponseInterface {
         //Parse request related directives from request
         $directives = Controller::parseDirectives(
             [
@@ -96,4 +95,4 @@ public static function handleGet(
             )
         );
     }
-}
+}

src/Controller/GetById.php

@@ -1,6 +1,6 @@
 <?php
 declare(strict_types=1);
-/**
+/*
  * Copyright 2015-2016 Xenofon Spafaridis
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -91,4 +91,4 @@ public static function handleGetById(
             )
         );
     }
-}
+}

src/Controller/Helper/RequestBodyQueue.php

@@ -1,6 +1,6 @@
 <?php
 declare(strict_types=1);
-/**
+/*
  * Copyright 2015-2016 Xenofon Spafaridis
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -55,4 +55,4 @@ public static function handleResource(
 
         return new ResourceQueueItem($attributes, $relationships);
     }
-}
+}

src/Controller/Helper/ResourceQueueItem.php

@@ -1,6 +1,6 @@
 <?php
 declare(strict_types=1);
-/**
+/*
  * Copyright 2015-2016 Xenofon Spafaridis
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -62,6 +62,4 @@ public function getRelationships() : \stdClass
     {
         return $this->relationships;
     }
-
-
 }

src/Controller/Patch.php

@@ -1,6 +1,6 @@
 <?php
 declare(strict_types=1);
-/**
+/*
  * Copyright 2015-2016 Xenofon Spafaridis
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -42,7 +42,7 @@ public static function handlePatch(
         array $validationCallbacks = [],
         callable $viewCallback = null,
         int $bulkLimit = null,
-        array $directives
+        array $directives = []
     ) : ResponseInterface {
         //Validate id using model's validator
         $id = $model->getIdAttributeValidator()->parse($id);
@@ -64,4 +64,4 @@ public static function handlePatch(
 
         //204 or view callback
     }
-}
+}

src/Controller/Post.php

@@ -1,6 +1,6 @@
 <?php
 declare(strict_types=1);
-/**
+/*
  * Copyright 2015-2016 Xenofon Spafaridis
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -62,8 +62,7 @@ public static function handlePost(
         $isBulk = true;
 
         //Treat all request data (bulk or not) as an array of resources
-        if (
-            is_object($data)
+        if (is_object($data)
             || (is_array($data) && Util::isArrayAssoc($data))
         ) {
             $isBulk = false;
@@ -195,15 +194,15 @@ public static function handlePost(
             );
         }
 
-        if (count($ids) === 1) {
+        /*if (count($ids) === 1) {
             //Prepare response with 201 Created status code
             return Response::created(
                 $response,
                 'link' . $ids[0] // location
             );
-        }
+        }*/ //see https://stackoverflow.com/questions/11309444/can-the-location-header-be-used-for-multiple-resource-locations-in-a-201-created
 
         //Return 204 No Content
         return Response::noContent($response);
     }
-}
+}

src/Controller/Put.php

@@ -1,6 +1,6 @@
 <?php
 declare(strict_types=1);
-/**
+/*
  * Copyright 2015-2016 Xenofon Spafaridis
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -41,7 +41,7 @@ public static function handlePut(
         array $validationCallbacks = [],
         callable $viewCallback = null,
         int $bulkLimit = null,
-        array $directives
+        array $directives = []
     ) : ResponseInterface {
         //Validate id using model's validator
         $id = $model->getIdAttributeValidator()->parse($id);
@@ -63,4 +63,4 @@ public static function handlePut(
 
         //204 or view callback
     }
-}
+}

src/Controller/Relationship.php

@@ -1,6 +1,6 @@
 <?php
 declare(strict_types=1);
-/**
+/*
  * Copyright 2015-2016 Xenofon Spafaridis
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -24,4 +24,4 @@
  */
 trait Relationship
 {
-}
+}

src/Controller/Response.php

@@ -1,6 +1,6 @@
 <?php
 declare(strict_types=1);
-/**
+/*
  * Copyright 2015-2016 Xenofon Spafaridis
  *
  * Licensed under the Apache License, Version 2.0 (the "License");

src/DataSource/DataSource.php

@@ -1,6 +1,6 @@
 <?php
 declare(strict_types=1);
-/**
+/*
  * Copyright 2015-2016 Xenofon Spafaridis
  *
  * Licensed under the Apache License, Version 2.0 (the "License");

src/DataSource/DatabaseDataSource.php

@@ -1,6 +1,6 @@
 <?php
 declare(strict_types=1);
-/**
+/*
  * Copyright 2015-2016 Xenofon Spafaridis
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -145,7 +145,7 @@ public function requireTableSetting() : string
     public function handleGet(
         string $query,
         bool $queryHasWhere = false,
-        array $directives
+        array $directives = []
     ) {
         $model = $this->resourceModel;
 
@@ -223,10 +223,10 @@ private function handleSort(
             );*/
 
             $replace = "\n" . sprintf(
-                    'ORDER BY "%s" %s',
-                    $sortAttribute,
-                    ($sort->getAttribute() ? 'ASC' : 'DESC')
-                );
+                'ORDER BY "%s" %s',
+                $sortAttribute,
+                ($sort->getAttribute() ? 'ASC' : 'DESC')
+            );
         }
 
         $query = str_replace(
@@ -289,9 +289,9 @@ private function handleFilterParseIn(array $array)
         return implode(
             ',',
             array_map(
-            /**
-             * Apply single quotes around key
-             */
+                /**
+                 * Apply single quotes around key
+                 */
                 function ($key) {
                     return '\'' . $key . '\'';
                 },

src/Directive/AdditionalParameters.php

@@ -1,6 +1,6 @@
 <?php
 declare(strict_types=1);
-/**
+/*
  * Copyright 2015-2016 Xenofon Spafaridis
  *
  * Licensed under the Apache License, Version 2.0 (the "License");

src/Directive/AdditionalRelationshipParameters.php

@@ -1,6 +1,6 @@
 <?php
 declare(strict_types=1);
-/**
+/*
  * Copyright 2015-2016 Xenofon Spafaridis
  *
  * Licensed under the Apache License, Version 2.0 (the "License");

src/Directive/Directive.php

@@ -1,6 +1,6 @@
 <?php
 declare(strict_types=1);
-/**
+/*
  * Copyright 2015-2016 Xenofon Spafaridis
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -106,8 +106,7 @@ function ($d) {
 
             if ($parsed !== null) {
                 //overwrite
-                if (
-                    $overwrite
+                if ($overwrite
                     && (
                     $key = array_search(
                         $directiveClass,

src/Directive/Fields.php

@@ -1,6 +1,6 @@
 <?php
 declare(strict_types=1);
-/**
+/*
  * Copyright 2015-2016 Xenofon Spafaridis
  *
  * Licensed under the Apache License, Version 2.0 (the "License");

src/Directive/Filter.php

@@ -1,6 +1,6 @@
 <?php
 declare(strict_types=1);
-/**
+/*
  * Copyright 2015-2016 Xenofon Spafaridis
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -274,7 +274,8 @@ public function validate(ResourceModel $model) : bool
                 } elseif ($validationModel
                     && isset(
                         $validationModel->attributes,
-                        $validationModel->attributes->properties->{$attribute})
+                        $validationModel->attributes->properties->{$attribute}
+                    )
                 ) { //Then attempt to use attribute validation resourceModel first
                     $attributeValidator =
                         $validationModel->attributes->properties->{$attribute};
@@ -297,7 +298,8 @@ public function validate(ResourceModel $model) : bool
                 }
 
                 //Check if operator is allowed
-                if (!$isJSONFilter && !in_array(
+                if (!$isJSONFilter
+                    && !in_array(
                         $operator,
                         Operator::getByClassFlags($operatorClass)
                     )

src/Directive/FilterAttribute.php

@@ -1,6 +1,6 @@
 <?php
 declare(strict_types=1);
-/**
+/*
  * Copyright 2015-2016 Xenofon Spafaridis
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -166,5 +166,4 @@ public function getOperand()
     {
         return $this->operand;
     }
-
 }

src/Directive/FilterJSONAttribute.php

@@ -1,6 +1,6 @@
 <?php
 declare(strict_types=1);
-/**
+/*
  * Copyright 2015-2016 Xenofon Spafaridis
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -59,5 +59,4 @@ public function getKey()
     {
         return $this->key;
     }
-
 }

src/Directive/IncludeResources.php

@@ -1,6 +1,6 @@
 <?php
 declare(strict_types=1);
-/**
+/*
  * Copyright 2015-2016 Xenofon Spafaridis
  *
  * Licensed under the Apache License, Version 2.0 (the "License");

src/Directive/Page.php

@@ -1,6 +1,6 @@
 <?php
 declare(strict_types=1);
-/**
+/*
  * Copyright 2015-2016 Xenofon Spafaridis
  *
  * Licensed under the Apache License, Version 2.0 (the "License");