Merge pull request #197 from netiul/fix/release-command

Minimal changes required to make the release command work

Author: mlocati

src/Package/PHP/Command/Release.php

@@ -36,6 +36,7 @@
 
 namespace Pickle\Package\PHP\Command;
 
+use Closure;
 use Pickle\Base\Interfaces;
 use Pickle\Package;
 use Pickle\Package\PHP\Util\PackageXml;
@@ -76,7 +77,7 @@ public function __construct($path, $cb = null, $noConvert = false)
 
     protected function readPackage($path)
     {
-        $package = PackageJson::readPackage($path, $noconvert);
+        $package = PackageJson::readPackage($path, $this->noConvert);
         $package->setRootDir(realpath($path));
 
         /* We're not adding any versions into the composer.json for the source release.

src/Package/PHP/Command/Release/Windows/Binary.php

@@ -106,7 +106,7 @@ protected function composerJsonBak(\Pickle\Base\Interfaces\Package $pkg, $restor
 
     protected function readPackage($path)
     {
-        $package = PackageJson::readPackage($path, $noconvert);
+        $package = PackageJson::readPackage($path, $this->noConvert);
         $this->composerJsonBak($package);
 
         /* For the binary release, json badly need the version informatio

src/Package/PHP/Util/PackageJson.php

@@ -42,7 +42,7 @@
 
 class PackageJson
 {
-    protected function readPackage($path, $noconvert)
+    public static function readPackage($path, $noconvert)
     {
         $jsonLoader = new Package\Util\JSON\Loader(new Package\Util\Loader());
         $package = null;
@@ -74,6 +74,8 @@ protected function readPackage($path, $noconvert)
         }
 
         $package->setRootDir(realpath($path));
+
+        return $package;
     }
 }
 

src/Package/Util/JSON/Loader.php

@@ -50,7 +50,7 @@ public function __construct(LoaderInterface $loader)
     /**
      * @param string $path
      *
-     * @return Pickle\Base\Interfaces\Package
+     * @return \Pickle\Base\Interfaces\Package
      */
     public function load($path)
     {