Merge branch 'master' into 5.1

Author: Sebastian Feldmann

build.xml

@@ -84,22 +84,6 @@
     </antcall>
   </target>
 
-  <target name="phar-alpha"
-          description="Create PHAR archive of PHPUnit and all its dependencies (alpha)"
-          depends="phar-prepare">
-    <antcall target="phar-build">
-      <param name="version" value="alpha"/>
-    </antcall>
-  </target>
-
-  <target name="phar-beta"
-          description="Create PHAR archive of PHPUnit and all its dependencies (beta)"
-          depends="phar-prepare">
-    <antcall target="phar-build">
-      <param name="version" value="beta"/>
-    </antcall>
-  </target>
-
   <target name="phar-prepare" depends="clean">
     <mkdir dir="${basedir}/build/phar"/>
 
@@ -393,15 +377,6 @@
       </fileset>
     </copy>
 
-    <copy file="${basedir}/vendor/sebastian/version/LICENSE"
-          tofile="${basedir}/build/phar/lib/sebastian-version/LICENSE"/>
-    <copy todir="${basedir}/build/phar/lib/sebastian-version">
-      <fileset dir="${basedir}/vendor/sebastian/version/src">
-        <include name="**/*.php"/>
-        <exclude name="**/autoload.php"/>
-      </fileset>
-    </copy>
-
     <!-- SOFTLAYER -->
     <copy file="${basedir}/vendor/softlayer/objectstorage/COPYING"
           tofile="${basedir}/build/phar/lib/softlayer-os/LICENSE"/>
@@ -450,8 +425,6 @@
       </fileset>
     </copy>
 
-    <exec executable="${basedir}/build/phar-patch.php"/>
-
   </target>
 
 
@@ -470,7 +443,6 @@
       <arg value="--all"/>
       <arg value="--phar"/>
       <arg value="--gzip"/>
-      <!-- <arg value="- -bzip2" /> -->
       <arg value="--output"/>
       <arg path="${basedir}/build/phpbu-${phar_version}.phar"/>
       <arg value="--template"/>

build/phar-patch.php

@@ -4,21 +4,28 @@
     exit(1);
 }
 
-$arg = trim($argv[1]);
+require __DIR__ . '/../vendor/autoload.php';
 
-if ($arg == 'alpha' || $arg == 'beta') {
-    $version = sprintf('%s-%s', $argv[1], date('Y-m-d'));
-} else {
-    $version = $arg;
-}
+$version = trim($argv[1]);
+
+if (strpos($version, 'dev') !== false) {
+    // smuggle in a more informative dev version number
+    try {
+        $repository = new SebastianFeldmann\Git\Repository(dirname(__DIR__));
+        $info       = $repository->getInfoOperator();
+        $version    = $info->getCurrentTag();
 
-file_put_contents(
-    __DIR__ . '/phar/Version.php',
-    str_replace(
-        'private static $pharVersion;',
-        'private static $pharVersion = "' . $version . '";',
-        file_get_contents(__DIR__ . '/phar/Version.php')
-    )
-);
+        file_put_contents(
+            __DIR__ . '/phar/Version.php',
+            preg_replace(
+                '#new self\\(\'.*\',#',
+                'new self(\'' . $version . '\',',
+                file_get_contents(__DIR__ . '/phar/Version.php')
+            )
+        );
+    } catch (\Exception $e) {
+        exit(1);
+    }
+}
 
 echo $version;

build/phar-version.php

@@ -36,13 +36,13 @@
     "ext-json": "*",
     "ext-spl": "*",
     "sebastian/environment": "~1.1|~2.0|~3.0",
-    "sebastian/version": "~1.0|~2.0",
     "sebastianfeldmann/cli": "~2.0",
     "sebastianfeldmann/ftp": "~0.9",
     "swiftmailer/swiftmailer": "~5.3|~6.0",
     "symfony/event-dispatcher": "~2.6|~3.0|~4.0"
   },
   "require-dev": {
+    "sebastianfeldmann/git": "~1.0",
     "aws/aws-sdk-php": "~3.10",
     "kunalvarma05/dropbox-php-sdk": "~0.2",
     "phpseclib/phpseclib": "~2.0",

composer.json

@@ -28,15 +28,15 @@ class Local extends Abstraction implements Collector
      */
     public function __construct(Target $target)
     {
-        $this->target    = $target;
-        $this->fileRegex = Util\Path::datePlaceholdersToRegex($this->target->getFilenameRaw());
+        $this->target = $target;
     }
 
     /**
      * Collect all created backups.
      */
     protected function collectBackups()
     {
+        $this->fileRegex = Util\Path::datePlaceholdersToRegex($this->target->getFilenameRaw());
         $this->collect($this->target->getPath()->getPathThatIsNotChanging());
     }
 

src/Backup/Collector/Local.php

@@ -17,34 +17,70 @@
 class Version
 {
     /**
-     * Version of the phar file.
-     * Is getting set via the phar build process.
+     * Current version
      *
      * @var string
      */
-    private static $pharVersion;
+    private static $version;
 
     /**
-     * Current version
+     * Path to application root directory.
      *
      * @var string
      */
-    private static $version;
+    private $path;
 
     /**
-     * Return the current version of PHPUnit.
+     * Current release version.
+     *
+     * @var string
+     */
+    private $release;
+
+    /**
+     * Current version number.
+     *
+     * @var string
+     */
+    private $number;
+
+    /**
+     * @param string $release
+     * @param string $path
+     */
+    public function __construct($release, $path)
+    {
+        $this->release = $release;
+        $this->path    = $path;
+    }
+
+    /**
+     * Return the full version number.
      *
      * @return string
      */
-    public static function id() : string
+    public function getVersionNumber()
     {
-        if (self::$pharVersion !== null) {
-            return self::$pharVersion;
+        if ($this->number === null) {
+            if (count(explode('.', $this->release)) == 3) {
+                $this->number = $this->release;
+            } else {
+                $this->number = $this->release . '-dev';
+            }
         }
+        return $this->number;
+    }
 
+    /**
+     * Return the current version of PHPUnit.
+     *
+     * @return string
+     */
+    public static function id() : string
+    {
         if (self::$version === null) {
-            $version = new SebastianBergmann\Version('5.1.2', dirname(dirname(__DIR__)));
-            self::$version = $version->getVersion();
+            $version = new self('5.1.3', dirname(dirname(__DIR__)));
+            self::$version = $version->getVersionNumber();
         }
 
         return self::$version;

src/Version.php

@@ -35,4 +35,24 @@ public function testGetVersion()
 
         $this->assertEquals('phpbu 5.1', substr($version, 0, 9), 'version should match');
     }
+
+    /**
+     * Tests Version::getVersionNumber
+     */
+    public function testVersionNumberDev()
+    {
+        $version = new Version('5.1', dirname(dirname(dirname(__DIR__))));
+
+        $this->assertEquals('5.1-dev', $number  = $version->getVersionNumber());
+    }
+
+    /**
+     * Tests Version::getVersionNumber
+     */
+    public function testVersionNumberRelease()
+    {
+        $version = new Version('5.1.0', dirname(dirname(dirname(__DIR__))));
+
+        $this->assertEquals('5.1.0', $number  = $version->getVersionNumber());
+    }
 }