Update the PHAR usages (#266)

- Remove the PHAR built-in signing for PHP-Scoper
- Add the release date to the PHAR version
- Add install instructions for Phive

Author: theofidry

.travis.yml

@@ -20,12 +20,6 @@ before_install:
   - echo "memory_limit=-1" >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/travis.ini
   - phpenv config-rm xdebug.ini || true
   - export COMPOSER_ROOT_VERSION=0.10.99
-  - |
-    if [ 'false' == "$TRAVIS_PULL_REQUEST" ]; then
-      cp box.json.dist box.json
-      openssl aes-256-cbc -K $encrypted_22e6e244c213_key -iv $encrypted_22e6e244c213_iv -in .travis/secrets.tar.enc -out .travis/secrets.tar -d
-      tar xvf .travis/secrets.tar -C .travis
-    fi;
 
 install:
   - composer install --no-interaction --no-progress --no-suggest --prefer-dist $COMPOSER_FLAGS
@@ -45,7 +39,6 @@ deploy:
     secure: 0ei0gMDsask+ro2LeUOPfsi99fbo8img/cUnAjg2RTcV03ANpQ5rZwG6PNBpaPLwGRNF+AGvHl+amrnL5b0ZLAMutif3v6oZLm9M5Kq4H2g3zqcvXkmxhRDvEsUJBqf2UvFEXxF03GZIsM29v3l6H09IfO0rL2itMibfwz9o3ialzanRQCxfBe8bHTsmKMZALA6Xk3/Vhj/cQdK0hVv+D6RGzAIv5AhLU5yLYNtu2UcvXZxdLt4RPwnVflx5Jiu/zsmEM/CuGryHGpHQTfbEh3OQCA1bcEyFWtAp3Ngl8IwA4S/7RLb3ukYhnoKefeYy6e10DUgQvKmekc4e9n53g8Wc8p2DRbA86rcABB0pI3rrIO7tAsvsr7H970Q/Jmn3QdoH0UcnO8JptnvZzSZ5MdbIMH5fsbri5kNIw748jJngAtPi8jFb4ekmkyOL8cpC/3C/S7c/oHE9yqn/WrSNEq181iIP2eYapOA/mWrk+Hysk/O1QH10vTejcJIDjE3tWR+XtuxQrxzfD5M1Vg+pr/G6BDNEom2h6/oKdi1sUwO0XKBpmIgiFTsp9EZA3O9fjoYmcFECc5HFrMtzYf79pNj6d6jggQgQa3LB4BViAsxqc9nYtj7zYsXqFxg3Y63MSsoyHkShzkTQjLKEkQ0EXVL5d8eWWplznQdAKiEDLxc=
   file:
     - bin/php-scoper.phar
-    - bin/php-scoper.phar.pubkey
   skip_cleanup: true
   on:
     tags: true

Makefile

@@ -416,13 +416,10 @@ fixtures/set025/composer.lock: fixtures/set025/composer.json
 fixtures/set027-laravel/composer.lock: fixtures/set027-laravel/composer.json
 	@echo fixtures/set027-laravel/composer.lock is not up to date.
 
-bin/php-scoper.phar: bin/php-scoper src vendor scoper.inc.php box.json
+bin/php-scoper.phar: bin/php-scoper src vendor scoper.inc.php box.json.dist
 	$(BOX) compile
 	touch $@
 
-box.json: box.json.dist
-	cat box.json.dist | sed -E 's/\"key\": \".+\",//g' | sed -E 's/\"algorithm\": \".+\",//g' > box.json
-
 COVERS_VALIDATOR=$(PHPBIN) vendor-bin/covers-validator/bin/covers-validator
 clover.xml: src
 	$(COVERS_VALIDATOR)

README.md

@@ -31,6 +31,7 @@ potentially very difficult to debug due to dissimilar or unsupported package ver
 
 - [Installation](#installation)
 - [Usage](#usage)
+    - [Phive](#phive)
     - [PHAR](#phar)
     - [Composer](#composer)
 - [Configuration](#configuration)
@@ -67,16 +68,27 @@ potentially very difficult to debug due to dissimilar or unsupported package ver
 ## Installation
 
 
+### Phive
+
+
+You can install Box with [Phive][phive]
+
+```bash
+$ phive install humbug/php-scoper --force-accept-unsigned
+```
+
+To upgrade `php-scoper` use the following command:
+
+```bash
+$ phive update humbug/php-scoper --force-accept-unsigned
+```
+
+
 ### PHAR
 
 The preferred method of installation is to use the PHP-Scoper PHAR, which can
 be downloaded from the most recent [Github Release][releases].
 
-As the PHAR is signed, you should also download the matching
-`php-scoper.phar.pubkey` to the same location. If you rename `php-scoper.phar`
-to `php-scoper`, you should also rename `php-scoper.phar.pubkey` to
-`php-scoper.pubkey`.
-
 
 ### Composer
 
@@ -764,3 +776,4 @@ now been moved under the
 [patchers]: #patchers
 [php-scoper-integration]: https://github.com/humbug/box#isolating-the-phar
 [phar-extract-to]: https://secure.php.net/manual/en/phar.extractto.php
+[phive]: https://github.com/phar-io/phive

box.json.dist

@@ -1,11 +1,20 @@
 {
-    "algorithm": "OPENSSL",
-    "key": ".travis/php-scoper-private.pem",
+    "banner": [
+        "This file is part of the humbug/php-scoper package.",
+        "",
+        "Copyright (c) 2017 Théo FIDRY <[email protected]>,",
+        "                   Pádraic Brady <[email protected]>",
+        "                   Bernhard Schussek <[email protected]>",
+        "",
+        "This source file is subject to the MIT license that is bundled",
+        "with this source code in the file LICENSE."
+    ],
 
     "files": [
         "src/scoper.inc.php.tpl"
     ],
     "git": "git_version_placeholder",
+    "datetime": "release-date",
 
     "compression": "GZ",
 

src/Console/Application.php

@@ -14,7 +14,9 @@
 
 namespace Humbug\PhpScoper\Console;
 
+use PackageVersions\Versions;
 use Symfony\Component\Console\Application as SymfonyApplication;
+use function trim;
 
 final class Application extends SymfonyApplication
 {
@@ -30,15 +32,38 @@ final class Application extends SymfonyApplication
 
 ASCII;
 
+    private $releaseDate;
+
+    /**
+     * {@inheritdoc}
+     */
+    public function __construct(string $name = 'Box', string $version = null, string $releaseDate = '@release-date@')
+    {
+        if (null === $version) {
+            $rawVersion = Versions::getVersion('humbug/php-scoper');
+
+            [$prettyVersion, $commitHash] = explode('@', $rawVersion);
+
+            $version = $prettyVersion.'@'.substr($commitHash, 0, 7);
+        }
+
+        $this->releaseDate = false === strpos($releaseDate, '@') ? $releaseDate : '';
+
+        parent::__construct($name, $version);
+    }
+
     /**
      * @inheritdoc
      */
     public function getLongVersion(): string
     {
-        return sprintf(
-            '<info>%s</info> version <comment>%s</comment>',
-            $this->getName(),
-            $this->getVersion()
+        return trim(
+            sprintf(
+                '<info>%s</info> version <comment>%s</comment> %s',
+                $this->getName(),
+                $this->getVersion(),
+                $this->releaseDate
+            )
         );
     }
 

tests/Console/Command/AddPrefixCommandTest.php

@@ -26,6 +26,7 @@
 use Symfony\Component\Filesystem\Filesystem;
 use function file_get_contents;
 use function Humbug\PhpScoper\escape_path;
+use function preg_replace;
 
 /**
  * @covers \Humbug\PhpScoper\Console\Command\AddPrefixCommand
@@ -103,6 +104,7 @@ public function test_get_help_menu()
 EOF;
 
         $actual = $this->appTester->getDisplay(true);
+        $actual = preg_replace('/php-scoper-test version .*/', 'php-scoper-test version UNKNOWN', $actual);
 
         $this->assertSame($expected, $actual);
         $this->assertSame(0, $this->appTester->getStatusCode());
@@ -126,6 +128,7 @@ public function test_get_version_menu()
 EOF;
 
         $actual = $this->appTester->getDisplay(true);
+        $actual = preg_replace('/php-scoper-test version .*/', 'php-scoper-test version UNKNOWN', $actual);
 
         $this->assertSame($expected, $actual);
         $this->assertSame(0, $this->appTester->getStatusCode());