From 51a5c2b2da4380ad563f43cbc060b333711b954f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Th=C3=A9o=20FIDRY?= Date: Mon, 7 May 2018 23:51:21 +0100 Subject: [PATCH] Remove self-update command I think solutions such as an auto-generated installer that could be created by Box or installing a PHAR via phive is a better solution. --- composer.json | 1 - composer.lock | 113 +--------------------------------------------- src/functions.php | 17 ------- 3 files changed, 2 insertions(+), 129 deletions(-) diff --git a/composer.json b/composer.json index f1852669..76cf46f9 100644 --- a/composer.json +++ b/composer.json @@ -21,7 +21,6 @@ "php": "^7.1", "nikic/php-parser": "^3.0", "ocramius/package-versions": "^1.1", - "padraic/phar-updater": "^1.0", "roave/better-reflection": "^2.0", "symfony/console": "^3.2 || ^4.0", "symfony/filesystem": "^3.2 || ^4.0", diff --git a/composer.lock b/composer.lock index 4f64b538..b9c90c18 100644 --- a/composer.lock +++ b/composer.lock @@ -1,10 +1,10 @@ { "_readme": [ "This file locks the dependencies of your project to a known state", - "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", + "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "229cecb000496023ebe7f7454d1452fd", + "content-hash": "1b72b0b26957bca6e70c5c255bb842a8", "packages": [ { "name": "nikic/php-parser", @@ -106,115 +106,6 @@ "description": "Composer plugin that provides efficient querying for installed package versions (no runtime IO)", "time": "2017-09-06T15:24:43+00:00" }, - { - "name": "padraic/humbug_get_contents", - "version": "1.0.4", - "source": { - "type": "git", - "url": "https://github.com/humbug/file_get_contents.git", - "reference": "66797199019d0cb4529cb8d29c6f0b4c5085b53a" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/humbug/file_get_contents/zipball/66797199019d0cb4529cb8d29c6f0b4c5085b53a", - "reference": "66797199019d0cb4529cb8d29c6f0b4c5085b53a", - "shasum": "" - }, - "require": { - "php": ">=5.3" - }, - "require-dev": { - "phpunit/phpunit": "~4.0" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.0-dev" - } - }, - "autoload": { - "psr-4": { - "Humbug\\": "src/Humbug/" - }, - "files": [ - "src/function.php" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "authors": [ - { - "name": "Pádraic Brady", - "email": "padraic.brady@gmail.com", - "homepage": "http://blog.astrumfutura.com" - } - ], - "description": "Secure wrapper for accessing HTTPS resources with file_get_contents for PHP 5.3+", - "homepage": "https://github.com/padraic/file_get_contents", - "keywords": [ - "download", - "file_get_contents", - "http", - "https", - "ssl", - "tls" - ], - "time": "2015-04-22T18:45:00+00:00" - }, - { - "name": "padraic/phar-updater", - "version": "1.0.4", - "source": { - "type": "git", - "url": "https://github.com/humbug/phar-updater.git", - "reference": "ac8802df2d1d03b7092b6f044a914f8d21592aae" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/humbug/phar-updater/zipball/ac8802df2d1d03b7092b6f044a914f8d21592aae", - "reference": "ac8802df2d1d03b7092b6f044a914f8d21592aae", - "shasum": "" - }, - "require": { - "padraic/humbug_get_contents": "1.0.4", - "php": ">=5.3.3" - }, - "require-dev": { - "phpunit/phpunit": "~4.0" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.0-dev" - } - }, - "autoload": { - "psr-4": { - "Humbug\\SelfUpdate\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "authors": [ - { - "name": "Padraic Brady", - "email": "padraic.brady@gmail.com", - "homepage": "http://blog.astrumfutura.com" - } - ], - "description": "A thing to make PHAR self-updating easy and secure.", - "keywords": [ - "humbug", - "phar", - "self-update", - "update" - ], - "time": "2017-07-12T22:42:45+00:00" - }, { "name": "phpdocumentor/reflection-common", "version": "1.0.1", diff --git a/src/functions.php b/src/functions.php index fb6ab748..d5905da6 100644 --- a/src/functions.php +++ b/src/functions.php @@ -17,15 +17,12 @@ use Humbug\PhpScoper\Console\Application; use Humbug\PhpScoper\Console\Command\AddPrefixCommand; use Humbug\PhpScoper\Console\Command\InitCommand; -use Humbug\PhpScoper\Console\Command\SelfUpdateCommand; use Humbug\PhpScoper\PhpParser\TraverserFactory; use Humbug\PhpScoper\Scoper\Composer\InstalledPackagesScoper; use Humbug\PhpScoper\Scoper\Composer\JsonFileScoper; use Humbug\PhpScoper\Scoper\NullScoper; use Humbug\PhpScoper\Scoper\PatchScoper; use Humbug\PhpScoper\Scoper\PhpScoper; -use Humbug\SelfUpdate\Exception\RuntimeException as SelfUpdateRuntimeException; -use Humbug\SelfUpdate\Updater; use Iterator; use PackageVersions\Versions; use PhpParser\Node; @@ -56,20 +53,6 @@ function create_application(): SymfonyApplication new InitCommand(), ]); - if ('phar:' === substr(__FILE__, 0, 5)) { - try { - $updater = new Updater(); - } catch (SelfUpdateRuntimeException $e) { - /* Allow E2E testing of unsigned phar */ - $updater = new Updater(null, false); - } - $app->add( - new SelfUpdateCommand( - $updater - ) - ); - } - return $app; }