style fix

Author: OriHoch

src/Factory.php

@@ -24,7 +24,7 @@ class Factory
      *  - JSON encoded object
      *  - URL (must be in either 'http' or 'https' schemes)
      *  - local filesystem (POSIX) path.
-     *  - local or remote zip file
+     *  - local or remote zip file.
      *
      * @param mixed       $source
      * @param null|string $basePath optional, required only if you want to use relative paths
@@ -323,21 +323,22 @@ protected static function loadSource($source, $basePath)
 
     protected static function isHttpZipSource($source)
     {
-        return (strtolower(substr($source, -4)) == '.zip');
+        return strtolower(substr($source, -4)) == '.zip';
     }
 
     protected static function isFileZipSource($source)
     {
-        return (strtolower(substr($source, -4)) == '.zip');
+        return strtolower(substr($source, -4)) == '.zip';
     }
 
     protected static function loadHttpZipSource($source)
     {
         $tempfile = tempnam(sys_get_temp_dir(), 'datapackage-php');
         unlink($tempfile);
-        $tempfile.='.zip';
+        $tempfile .= '.zip';
         stream_copy_to_stream(fopen($source, 'r'), fopen($tempfile, 'w'));
-        register_shutdown_function(function() use ($tempfile) {unlink($tempfile);});
+        register_shutdown_function(function () use ($tempfile) {unlink($tempfile); });
+
         return self::loadFileZipSource($tempfile);
     }
 
@@ -347,11 +348,12 @@ protected static function loadFileZipSource($source)
         $tempdir = tempnam(sys_get_temp_dir(), 'datapackage-php');
         unlink($tempdir);
         mkdir($tempdir);
-        register_shutdown_function(function() use ($tempdir) {Utils::removeDir($tempdir);});
+        register_shutdown_function(function () use ($tempdir) {Utils::removeDir($tempdir); });
         $zippy->open($source)->extract($tempdir);
-        if (!file_exists($tempdir."/datapackage.json")) {
-            throw new Exceptions\DatapackageInvalidSourceException("zip file must contain a datappackage.json file");
+        if (!file_exists($tempdir.'/datapackage.json')) {
+            throw new Exceptions\DatapackageInvalidSourceException('zip file must contain a datappackage.json file');
         }
-        return static::loadSource($tempdir."/datapackage.json", $tempdir);
+
+        return static::loadSource($tempdir.'/datapackage.json', $tempdir);
     }
 }

src/Resources/BaseResource.php

@@ -37,31 +37,38 @@ public static function handlesDescriptor($descriptor)
         return static::handlesProfile(Registry::getResourceValidationProfile($descriptor));
     }
 
-    public function read($readOptions=null)
+    public function read($readOptions = null)
     {
-        $limit = ($readOptions && isset($readOptions["limit"])) ? $readOptions["limit"] : null;
+        $limit = ($readOptions && isset($readOptions['limit'])) ? $readOptions['limit'] : null;
         $rows = [];
         foreach ($this->dataStreams() as $dataStream) {
             if (isset($dataStream->table)) {
-                $readOptions["limit"] = $limit;
+                $readOptions['limit'] = $limit;
                 foreach ($dataStream->table->read($readOptions) as $row) {
                     $rows[] = $row;
                     if ($limit !== null) {
-                        $limit--;
-                        if ($limit < 0) break;
+                        --$limit;
+                        if ($limit < 0) {
+                            break;
+                        }
                     }
-                };
+                }
             } else {
                 foreach ($dataStream as $row) {
                     $rows[] = $row;
                     if ($limit !== null) {
-                        $limit--;
-                        if ($limit < 0) break;
+                        --$limit;
+                        if ($limit < 0) {
+                            break;
+                        }
                     }
                 }
             }
-            if ($limit !== null && $limit < 0) break;
+            if ($limit !== null && $limit < 0) {
+                break;
+            }
         }
+
         return $rows;
     }
 

src/Resources/TabularResource.php

@@ -44,9 +44,9 @@ protected function getInlineDataStream($data)
 
     public static function handlesDescriptor($descriptor)
     {
-        return (
+        return
             Registry::getResourceValidationProfile($descriptor) == 'tabular-data-resource'
             || (isset($descriptor->format) && in_array($descriptor->format, ['csv', 'tsv']))
-        );
+        ;
     }
 }

tests/DatapackageTest.php

@@ -476,13 +476,13 @@ public function testLoadDatapackageZip()
             'jurisdiction' => 'Austria',
             'population in millions' => 8.7474000000000007,
             'GDP in $Billions' => 386.42779999999999,
-            'GDP per cap' => 44176.519999999997
+            'GDP per cap' => 44176.519999999997,
         ], [
             'jurisdiction' => 'Belgium',
             'population in millions' => 11.3482,
             'GDP in $Billions' => 466.3657,
-            'GDP per cap' => 41096.160000000003
-        ]], $package->resource('eucountrydatawb_csv')->read(["limit" => 2]));
+            'GDP per cap' => 41096.160000000003,
+        ]], $package->resource('eucountrydatawb_csv')->read(['limit' => 2]));
     }
 
     public function testStringPath()
@@ -557,7 +557,7 @@ public function testDataHubCountryList()
             }
         }
         $this->assertEquals(['data_csv', 'data_json', 'datapackage_zip', 'data'], array_keys($resources));
-        $this->assertEquals(["Name" => "Afghanistan", "Code" => "AF"], $resources['data_csv'][0]);
+        $this->assertEquals(['Name' => 'Afghanistan', 'Code' => 'AF'], $resources['data_csv'][0]);
 
         // now, let's try to load it but get it as tabular data
         $descriptor = json_decode(file_get_contents(dirname(__FILE__).'/fixtures/datahub-country-list/datapackage.json'));