minor issues fixes from Jo Surikat

hiqsol · hiqsol · commit 4b7abfab557c · 2016-06-23T22:12:18.000Z
diff --git a/src/components/Storage.php b/src/components/Storage.php
@@ -105,7 +105,7 @@ public function readPackage(AssetPackage $package)
         $name = $package->getNormalName();
         $path = $this->buildHashedPath($name);
         if (!file_exists($path)) {
-            return [];
+            return null;
         }
         $json = file_get_contents($path);
         $updateTime = filemtime($path);
@@ -135,7 +135,7 @@ protected function writeProviderLatest($name, $hash)
         if (file_exists($latest_path)) {
             $data = Json::decode(file_get_contents($latest_path) ?: '[]');
         }
-        if (!is_array($data)) {
+        if (!isset($data) || !is_array($data)) {
             $data = [];
         }
         if (!isset($data['providers'])) {

Original file line number	Diff line number	Diff line change
`@@ -105,7 +105,7 @@ public function readPackage(AssetPackage $package)`
`105`	`105`	`$name = $package->getNormalName();`
`106`	`106`	`$path = $this->buildHashedPath($name);`
`107`	`107`	`if (!file_exists($path)) {`
`108`		`- return [];`
	`108`	`+ return null;`
`109`	`109`	`}`
`110`	`110`	`$json = file_get_contents($path);`
`111`	`111`	`$updateTime = filemtime($path);`
`@@ -135,7 +135,7 @@ protected function writeProviderLatest($name, $hash)`
`135`	`135`	`if (file_exists($latest_path)) {`
`136`	`136`	`$data = Json::decode(file_get_contents($latest_path) ?: '[]');`
`137`	`137`	`}`
`138`		`- if (!is_array($data)) {`
	`138`	`+ if (!isset($data) \|\| !is_array($data)) {`
`139`	`139`	`$data = [];`
`140`	`140`	`}`
`141`	`141`	`if (!isset($data['providers'])) {`