beutify

Zlob · Zlob · commit a0dca76cc1ec · 2015-08-13T19:56:38.000+03:00
diff --git a/src/DataBase.php b/src/DataBase.php
@@ -33,7 +33,7 @@ class DataBase
     public function __construct($pathToFile)
     {
         $this->dbFile = fopen($pathToFile, 'r+b');
-        if(!$this->dbFile){
+        if (!$this->dbFile) {
             throw new \RuntimeException("cannot open file $pathToFile");
         }
         flock($this->dbFile, LOCK_EX);
diff --git a/src/JsonServer.php b/src/JsonServer.php
@@ -35,7 +35,7 @@ class JsonServer
      */
     public function __construct()
     {
-        $this->jsonDb = new DataBase(__DIR__ .'/..'. Config::get('pathToDb'));
+        $this->jsonDb = new DataBase(__DIR__ . '/..' . Config::get('pathToDb'));
         $this->response = new Response();
         $this->response->headers->set('Content-Type', 'application/vnd.api+json');
     }
@@ -74,7 +74,7 @@ public function handleRequest($method, $uri, $data = [])
      */
     public function GET($tabName, $id, $parent, $data)
     {
-        try{
+        try {
             $result = $this->jsonDb->$tabName->filterByParent($parent);
             $result = $this->processFilters($result);
             //fetching single resource
@@ -88,8 +88,7 @@ public function GET($tabName, $id, $parent, $data)
                 $this->response->headers->set('X-Total-Count', $result->count());
                 $this->response->setStatusCode(200);
             }
-        }
-        catch(\OutOfRangeException $e){
+        } catch (\OutOfRangeException $e) {
             return call_user_func(Config::get('resourceNotFound'), $this->response);
         }
         return $this->response;
@@ -151,7 +150,7 @@ public function DELETE($tabName, $id, $parent, $data)
     {
         if ($id) {
             $table = $this->jsonDb->$tabName;
-            try{
+            try {
                 $table->delete($id);
                 $this->jsonDb->save();
                 $this->response->setContent('');
diff --git a/src/Row.php b/src/Row.php
@@ -94,14 +94,14 @@ public function setData($data)
      */
     public function toArray()
     {
-        if (Config::get('fieldsAutoSorting')){
-            uksort ($this->fields, Config::get('fieldsAutoSortingFunc'));
+        if (Config::get('fieldsAutoSorting')) {
+            uksort($this->fields, Config::get('fieldsAutoSortingFunc'));
         }
-        if($this->table){
+        if ($this->table) {
             $this->embedResources($this->table->getEmbeds());
         }
         $result = $this->fields;
-        foreach($this->embeddedResources as $resName=>$resource){
+        foreach ($this->embeddedResources as $resName => $resource) {
             $result[$resName] = $resource->toArray();
         }
         return $result;
@@ -125,8 +125,8 @@ public function getContent()
      */
     public function search($q)
     {
-        foreach($this->fields as $field){
-            if(strpos($field, $q) !== false){
+        foreach ($this->fields as $field) {
+            if (strpos($field, $q) !== false) {
                 return true;
             }
         }
@@ -140,8 +140,8 @@ public function search($q)
      */
     public function embedResources($resources)
     {
-        if($resources){
-            foreach($resources as $resource){
+        if ($resources) {
+            foreach ($resources as $resource) {
                 $tabName = $this->table->getTabName();
                 $this->embeddedResources[$resource] = $this->table->getDb()->$resource->filterByParent(['table' => $tabName, 'id' => $this->id]);
             }
diff --git a/src/Table.php b/src/Table.php
@@ -152,7 +152,7 @@ public function filterByParent($parent)
     public function insert($data, $parent = null)
     {
         $row = new Row($data, $this);
-        if($parent){
+        if ($parent) {
             $parentName = $this->getParentKeyName($parent['table']);
             $row->$parentName = $parent['id'];
         }
@@ -204,7 +204,7 @@ public function getNewId()
         foreach ($this->rows as $row) {
             $ids[] = $row->id;
         }
-        if(count($ids) === 0){
+        if (count($ids) === 0) {
             return 1;
         }
         sort($ids);
@@ -329,7 +329,7 @@ public function _sort($field)
     public function _order($order)
     {
         $order = mb_strtolower($order);
-        if($order !== 'asc' && $order !== 'desc' ){
+        if ($order !== 'asc' && $order !== 'desc') {
             throw new \DomainException ("Unknown sort type $order");
         }
         $this->sortOrder = $order;
@@ -344,7 +344,7 @@ public function _order($order)
      */
     public function _start($start)
     {
-        if( !is_numeric($start) || $start < 0){
+        if (!is_numeric($start) || $start < 0) {
             throw new \DomainException ("Start '$start' must be a positive integer");
         }
         $this->start = $start;
@@ -359,7 +359,7 @@ public function _start($start)
      */
     public function _end($end)
     {
-        if( !is_numeric($end) || $end < 0){
+        if (!is_numeric($end) || $end < 0) {
             throw new \DomainException ("end '$end'' must be a positive integer");
         }
         $this->end = $end;
@@ -374,7 +374,7 @@ public function _end($end)
      */
     public function _limit($limit)
     {
-        if( !is_numeric($limit) || $limit < 0){
+        if (!is_numeric($limit) || $limit < 0) {
             throw new \DomainException ("limit '$limit'' must be a positive integer");
         }
         $this->limit = $limit;
@@ -431,18 +431,18 @@ private function sort()
     {
         $sortField = $this->sortField;
         $sortOrder = $this->sortOrder;
-        $sortFunc = function($a, $b) use ( $sortField, $sortOrder ){
-            if ($a->$sortField === $b->$sortField){
+        $sortFunc = function ($a, $b) use ($sortField, $sortOrder) {
+            if ($a->$sortField === $b->$sortField) {
                 return 0;
             }
-            if ($a->$sortField > $b->$sortField){
+            if ($a->$sortField > $b->$sortField) {
                 return $sortOrder === 'asc' ? 1 : -1;
             }
-            if ($a->$sortField < $b->$sortField){
+            if ($a->$sortField < $b->$sortField) {
                 return $sortOrder === 'asc' ? -1 : 1;
             }
         };
-        usort ($this->rows, $sortFunc);
+        usort($this->rows, $sortFunc);
     }
 
     /**
@@ -454,7 +454,7 @@ private function sort()
     private function filter($callback)
     {
         $table = clone $this;
-        $table->rows = array_slice(array_filter($this->rows, $callback),0);
+        $table->rows = array_slice(array_filter($this->rows, $callback), 0);
         return $table;
     }
 
diff --git a/tests/DataBaseTest.php b/tests/DataBaseTest.php
@@ -7,7 +7,7 @@ class DataBaseTest extends PHPUnit_Framework_TestCase
 
     protected function setUp()
     {
-        $this->fixture = new \JsonServer\DataBase(getcwd().'/tests/Mock/pluralDB.json');
+        $this->fixture = new \JsonServer\DataBase(getcwd() . '/tests/Mock/pluralDB.json');
     }
 
     protected function tearDown()
diff --git a/tests/Mock/pluralDB.json b/tests/Mock/pluralDB.json
@@ -1,28 +1,28 @@
 {
-    "posts": [
-        {
-            "id": 1,
-            "title": "json-server",
-            "author": "zlob"
-        },
-        {
-            "id": 2,
-            "title": "json-server",
-            "author": "zlob"
-        }
-    ],
-    "comments": [
-        {
-            "id": 1,
-            "body": "some comment",
-            "post_id": 1
-        }
-    ],
-    "votes": [
-        {
-            "id": 1,
-            "rating": 1,
-            "comment_id": 1
-        }
-    ]
+  "posts": [
+    {
+      "id": 1,
+      "title": "json-server",
+      "author": "zlob"
+    },
+    {
+      "id": 2,
+      "title": "json-server",
+      "author": "zlob"
+    }
+  ],
+  "comments": [
+    {
+      "id": 1,
+      "body": "some comment",
+      "post_id": 1
+    }
+  ],
+  "votes": [
+    {
+      "id": 1,
+      "rating": 1,
+      "comment_id": 1
+    }
+  ]
 }
diff --git a/tests/Mock/singularDB.json b/tests/Mock/singularDB.json
@@ -1,28 +1,28 @@
 {
-    "post": [
-        {
-            "id": 1,
-            "title": "json-server",
-            "author": "zlob"
-        },
-        {
-            "id": 2,
-            "title": "json-server",
-            "author": "zlob"
-        }
-    ],
-    "comment": [
-        {
-            "id": 1,
-            "body": "some comment",
-            "post_id": 1
-        }
-    ],
-    "vote": [
-        {
-            "id": 1,
-            "rating": 1,
-            "comment_id": 1
-        }
-    ]
+  "post": [
+    {
+      "id": 1,
+      "title": "json-server",
+      "author": "zlob"
+    },
+    {
+      "id": 2,
+      "title": "json-server",
+      "author": "zlob"
+    }
+  ],
+  "comment": [
+    {
+      "id": 1,
+      "body": "some comment",
+      "post_id": 1
+    }
+  ],
+  "vote": [
+    {
+      "id": 1,
+      "rating": 1,
+      "comment_id": 1
+    }
+  ]
 }
diff --git a/tests/RowTest.php b/tests/RowTest.php
@@ -7,7 +7,7 @@ class RowTest extends PHPUnit_Framework_TestCase
 
     protected function setUp()
     {
-        $this->fixture = new \JsonServer\Row(['id'=>0, 'field1' => 1, 'field2' => 'some string']);
+        $this->fixture = new \JsonServer\Row(['id' => 0, 'field1' => 1, 'field2' => 'some string']);
     }
 
     protected function tearDown()
@@ -28,17 +28,17 @@ public function testSetPassed()
 
     public function testSetFields()
     {
-        $data = ['id'=>77, 'field1' => 11, 'field2' => 22];
+        $data = ['id' => 77, 'field1' => 11, 'field2' => 22];
         $this->fixture->setData($data);
-        $dataExpext = ['id'=>0, 'field1' => 11, 'field2' => 22];
+        $dataExpext = ['id' => 0, 'field1' => 11, 'field2' => 22];
         static::assertEquals($this->fixture->toArray(), $dataExpext, 'mass assignment trough setData is working');
     }
 
     public function testSortingFields()
     {
-        $data = ['field2' => 22, 'field1' => 11,'id'=>77 ];
+        $data = ['field2' => 22, 'field1' => 11, 'id' => 77];
         $this->fixture->setData($data);
-        $dataExpext = ['id'=>0, 'field1' => 11, 'field2' => 22];
+        $dataExpext = ['id' => 0, 'field1' => 11, 'field2' => 22];
         static::assertEquals($this->fixture->toArray(), $dataExpext, 'fields sorting correctly');
     }
 
diff --git a/tests/ServerTest.php b/tests/ServerTest.php
@@ -10,10 +10,11 @@ protected function tearDown()
     {
         $this->fixture->__destruct();
     }
+
     /**
      * @dataProvider requestProviderSingular
      */
-    public function testRequestSingularSingular ($method, $url, $data, $expected, $msg)
+    public function testRequestSingularSingular($method, $url, $data, $expected, $msg)
     {
         $config = \JsonServer\Config::getInstance();
         $config->set('urlNamingForm', 'singularize');
@@ -28,7 +29,7 @@ public function testRequestSingularSingular ($method, $url, $data, $expected, $m
     /**
      * @dataProvider requestProviderSingular
      */
-    public function testRequestSingularPlural ($method, $url, $data, $expected, $msg)
+    public function testRequestSingularPlural($method, $url, $data, $expected, $msg)
     {
         $config = \JsonServer\Config::getInstance();
         $config->set('urlNamingForm', 'singularize');
@@ -53,7 +54,7 @@ public function requestProviderSingular()
     /**
      * @dataProvider requestProviderPlural
      */
-    public function testRequestPluralSingular ($method, $url, $data, $expected, $msg)
+    public function testRequestPluralSingular($method, $url, $data, $expected, $msg)
     {
         $config = \JsonServer\Config::getInstance();
         $config->set('urlNamingForm', 'pluralize');
@@ -68,7 +69,7 @@ public function testRequestPluralSingular ($method, $url, $data, $expected, $msg
     /**
      * @dataProvider requestProviderPlural
      */
-    public function testRequestPluralPlural ($method, $url, $data, $expected, $msg)
+    public function testRequestPluralPlural($method, $url, $data, $expected, $msg)
     {
         $config = \JsonServer\Config::getInstance();
         $config->set('urlNamingForm', 'pluralize');
diff --git a/tests/TableTest.php b/tests/TableTest.php

Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ class DataBase`
`33`	`33`	`public function __construct($pathToFile)`
`34`	`34`	`{`
`35`	`35`	`$this->dbFile = fopen($pathToFile, 'r+b');`
`36`		`- if(!$this->dbFile){`
	`36`	`+ if (!$this->dbFile) {`
`37`	`37`	`throw new \RuntimeException("cannot open file $pathToFile");`
`38`	`38`	`}`
`39`	`39`	`flock($this->dbFile, LOCK_EX);`
Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@ class JsonServer`
`35`	`35`	`*/`
`36`	`36`	`public function __construct()`
`37`	`37`	`{`
`38`		`- $this->jsonDb = new DataBase(__DIR__ .'/..'. Config::get('pathToDb'));`
	`38`	`+ $this->jsonDb = new DataBase(__DIR__ . '/..' . Config::get('pathToDb'));`
`39`	`39`	`$this->response = new Response();`
`40`	`40`	`$this->response->headers->set('Content-Type', 'application/vnd.api+json');`
`41`	`41`	`}`
`@@ -74,7 +74,7 @@ public function handleRequest($method, $uri, $data = [])`
`74`	`74`	`*/`
`75`	`75`	`public function GET($tabName, $id, $parent, $data)`
`76`	`76`	`{`
`77`		`- try{`
	`77`	`+ try {`
`78`	`78`	`$result = $this->jsonDb->$tabName->filterByParent($parent);`
`79`	`79`	`$result = $this->processFilters($result);`
`80`	`80`	`//fetching single resource`
`@@ -88,8 +88,7 @@ public function GET($tabName, $id, $parent, $data)`
`88`	`88`	`$this->response->headers->set('X-Total-Count', $result->count());`
`89`	`89`	`$this->response->setStatusCode(200);`
`90`	`90`	`}`
`91`		`- }`
`92`		`- catch(\OutOfRangeException $e){`
	`91`	`+ } catch (\OutOfRangeException $e) {`
`93`	`92`	`return call_user_func(Config::get('resourceNotFound'), $this->response);`
`94`	`93`	`}`
`95`	`94`	`return $this->response;`
`@@ -151,7 +150,7 @@ public function DELETE($tabName, $id, $parent, $data)`
`151`	`150`	`{`
`152`	`151`	`if ($id) {`
`153`	`152`	`$table = $this->jsonDb->$tabName;`
`154`		`- try{`
	`153`	`+ try {`
`155`	`154`	`$table->delete($id);`
`156`	`155`	`$this->jsonDb->save();`
`157`	`156`	`$this->response->setContent('');`
Original file line number	Diff line number	Diff line change
`@@ -94,14 +94,14 @@ public function setData($data)`
`94`	`94`	`*/`
`95`	`95`	`public function toArray()`
`96`	`96`	`{`
`97`		`- if (Config::get('fieldsAutoSorting')){`
`98`		`- uksort ($this->fields, Config::get('fieldsAutoSortingFunc'));`
	`97`	`+ if (Config::get('fieldsAutoSorting')) {`
	`98`	`+ uksort($this->fields, Config::get('fieldsAutoSortingFunc'));`
`99`	`99`	`}`
`100`		`- if($this->table){`
	`100`	`+ if ($this->table) {`
`101`	`101`	`$this->embedResources($this->table->getEmbeds());`
`102`	`102`	`}`
`103`	`103`	`$result = $this->fields;`
`104`		`- foreach($this->embeddedResources as $resName=>$resource){`
	`104`	`+ foreach ($this->embeddedResources as $resName => $resource) {`
`105`	`105`	`$result[$resName] = $resource->toArray();`
`106`	`106`	`}`
`107`	`107`	`return $result;`
`@@ -125,8 +125,8 @@ public function getContent()`
`125`	`125`	`*/`
`126`	`126`	`public function search($q)`
`127`	`127`	`{`
`128`		`- foreach($this->fields as $field){`
`129`		`- if(strpos($field, $q) !== false){`
	`128`	`+ foreach ($this->fields as $field) {`
	`129`	`+ if (strpos($field, $q) !== false) {`
`130`	`130`	`return true;`
`131`	`131`	`}`
`132`	`132`	`}`
`@@ -140,8 +140,8 @@ public function search($q)`
`140`	`140`	`*/`
`141`	`141`	`public function embedResources($resources)`
`142`	`142`	`{`
`143`		`- if($resources){`
`144`		`- foreach($resources as $resource){`
	`143`	`+ if ($resources) {`
	`144`	`+ foreach ($resources as $resource) {`
`145`	`145`	`$tabName = $this->table->getTabName();`
`146`	`146`	`$this->embeddedResources[$resource] = $this->table->getDb()->$resource->filterByParent(['table' => $tabName, 'id' => $this->id]);`
`147`	`147`	`}`
Original file line number	Diff line number	Diff line change
`@@ -152,7 +152,7 @@ public function filterByParent($parent)`
`152`	`152`	`public function insert($data, $parent = null)`
`153`	`153`	`{`
`154`	`154`	`$row = new Row($data, $this);`
`155`		`- if($parent){`
	`155`	`+ if ($parent) {`
`156`	`156`	`$parentName = $this->getParentKeyName($parent['table']);`
`157`	`157`	`$row->$parentName = $parent['id'];`
`158`	`158`	`}`
`@@ -204,7 +204,7 @@ public function getNewId()`
`204`	`204`	`foreach ($this->rows as $row) {`
`205`	`205`	`$ids[] = $row->id;`
`206`	`206`	`}`
`207`		`- if(count($ids) === 0){`
	`207`	`+ if (count($ids) === 0) {`
`208`	`208`	`return 1;`
`209`	`209`	`}`
`210`	`210`	`sort($ids);`
`@@ -329,7 +329,7 @@ public function _sort($field)`
`329`	`329`	`public function _order($order)`
`330`	`330`	`{`
`331`	`331`	`$order = mb_strtolower($order);`
`332`		`- if($order !== 'asc' && $order !== 'desc' ){`
	`332`	`+ if ($order !== 'asc' && $order !== 'desc') {`
`333`	`333`	`throw new \DomainException ("Unknown sort type $order");`
`334`	`334`	`}`
`335`	`335`	`$this->sortOrder = $order;`
`@@ -344,7 +344,7 @@ public function _order($order)`
`344`	`344`	`*/`
`345`	`345`	`public function _start($start)`
`346`	`346`	`{`
`347`		`- if( !is_numeric($start) \|\| $start < 0){`
	`347`	`+ if (!is_numeric($start) \|\| $start < 0) {`
`348`	`348`	`throw new \DomainException ("Start '$start' must be a positive integer");`
`349`	`349`	`}`
`350`	`350`	`$this->start = $start;`
`@@ -359,7 +359,7 @@ public function _start($start)`
`359`	`359`	`*/`
`360`	`360`	`public function _end($end)`
`361`	`361`	`{`
`362`		`- if( !is_numeric($end) \|\| $end < 0){`
	`362`	`+ if (!is_numeric($end) \|\| $end < 0) {`
`363`	`363`	`throw new \DomainException ("end '$end'' must be a positive integer");`
`364`	`364`	`}`
`365`	`365`	`$this->end = $end;`
`@@ -374,7 +374,7 @@ public function _end($end)`
`374`	`374`	`*/`
`375`	`375`	`public function _limit($limit)`
`376`	`376`	`{`
`377`		`- if( !is_numeric($limit) \|\| $limit < 0){`
	`377`	`+ if (!is_numeric($limit) \|\| $limit < 0) {`
`378`	`378`	`throw new \DomainException ("limit '$limit'' must be a positive integer");`
`379`	`379`	`}`
`380`	`380`	`$this->limit = $limit;`
`@@ -431,18 +431,18 @@ private function sort()`
`431`	`431`	`{`
`432`	`432`	`$sortField = $this->sortField;`
`433`	`433`	`$sortOrder = $this->sortOrder;`
`434`		`- $sortFunc = function($a, $b) use ( $sortField, $sortOrder ){`
`435`		`- if ($a->$sortField === $b->$sortField){`
	`434`	`+ $sortFunc = function ($a, $b) use ($sortField, $sortOrder) {`
	`435`	`+ if ($a->$sortField === $b->$sortField) {`
`436`	`436`	`return 0;`
`437`	`437`	`}`
`438`		`- if ($a->$sortField > $b->$sortField){`
	`438`	`+ if ($a->$sortField > $b->$sortField) {`
`439`	`439`	`return $sortOrder === 'asc' ? 1 : -1;`
`440`	`440`	`}`
`441`		`- if ($a->$sortField < $b->$sortField){`
	`441`	`+ if ($a->$sortField < $b->$sortField) {`
`442`	`442`	`return $sortOrder === 'asc' ? -1 : 1;`
`443`	`443`	`}`
`444`	`444`	`};`
`445`		`- usort ($this->rows, $sortFunc);`
	`445`	`+ usort($this->rows, $sortFunc);`
`446`	`446`	`}`
`447`	`447`
`448`	`448`	`/**`
`@@ -454,7 +454,7 @@ private function sort()`
`454`	`454`	`private function filter($callback)`
`455`	`455`	`{`
`456`	`456`	`$table = clone $this;`
`457`		`- $table->rows = array_slice(array_filter($this->rows, $callback),0);`
	`457`	`+ $table->rows = array_slice(array_filter($this->rows, $callback), 0);`
`458`	`458`	`return $table;`
`459`	`459`	`}`
`460`	`460`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ class DataBaseTest extends PHPUnit_Framework_TestCase`
`7`	`7`
`8`	`8`	`protected function setUp()`
`9`	`9`	`{`
`10`		`- $this->fixture = new \JsonServer\DataBase(getcwd().'/tests/Mock/pluralDB.json');`
	`10`	`+ $this->fixture = new \JsonServer\DataBase(getcwd() . '/tests/Mock/pluralDB.json');`
`11`	`11`	`}`
`12`	`12`
`13`	`13`	`protected function tearDown()`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ class RowTest extends PHPUnit_Framework_TestCase`
`7`	`7`
`8`	`8`	`protected function setUp()`
`9`	`9`	`{`
`10`		`- $this->fixture = new \JsonServer\Row(['id'=>0, 'field1' => 1, 'field2' => 'some string']);`
	`10`	`+ $this->fixture = new \JsonServer\Row(['id' => 0, 'field1' => 1, 'field2' => 'some string']);`
`11`	`11`	`}`
`12`	`12`
`13`	`13`	`protected function tearDown()`
`@@ -28,17 +28,17 @@ public function testSetPassed()`
`28`	`28`
`29`	`29`	`public function testSetFields()`
`30`	`30`	`{`
`31`		`- $data = ['id'=>77, 'field1' => 11, 'field2' => 22];`
	`31`	`+ $data = ['id' => 77, 'field1' => 11, 'field2' => 22];`
`32`	`32`	`$this->fixture->setData($data);`
`33`		`- $dataExpext = ['id'=>0, 'field1' => 11, 'field2' => 22];`
	`33`	`+ $dataExpext = ['id' => 0, 'field1' => 11, 'field2' => 22];`
`34`	`34`	`static::assertEquals($this->fixture->toArray(), $dataExpext, 'mass assignment trough setData is working');`
`35`	`35`	`}`
`36`	`36`
`37`	`37`	`public function testSortingFields()`
`38`	`38`	`{`
`39`		`- $data = ['field2' => 22, 'field1' => 11,'id'=>77 ];`
	`39`	`+ $data = ['field2' => 22, 'field1' => 11, 'id' => 77];`
`40`	`40`	`$this->fixture->setData($data);`
`41`		`- $dataExpext = ['id'=>0, 'field1' => 11, 'field2' => 22];`
	`41`	`+ $dataExpext = ['id' => 0, 'field1' => 11, 'field2' => 22];`
`42`	`42`	`static::assertEquals($this->fixture->toArray(), $dataExpext, 'fields sorting correctly');`
`43`	`43`	`}`
`44`	`44`