diff options
| -rw-r--r-- | composer.json | 1 | ||||
| -rw-r--r-- | installed.json | 276 | ||||
| -rw-r--r-- | pie-rpm.patch | 29 | ||||
| -rw-r--r-- | pie.spec | 9 | 
4 files changed, 273 insertions, 42 deletions
diff --git a/composer.json b/composer.json index 12d276b..24fddc6 100644 --- a/composer.json +++ b/composer.json @@ -35,6 +35,7 @@          "illuminate/container": "^10.48.28",          "psr/container": "^2.0.2",          "symfony/console": "^6.4.20", +        "symfony/event-dispatcher": "^6.4.13",          "symfony/process": "^6.4.20",          "webmozart/assert": "^1.11"      }, diff --git a/installed.json b/installed.json index dbf8a86..d4d4548 100644 --- a/installed.json +++ b/installed.json @@ -1042,6 +1042,59 @@              "install-path": "../psr/container"          },          { +            "name": "psr/event-dispatcher", +            "version": "1.0.0", +            "version_normalized": "1.0.0.0", +            "source": { +                "type": "git", +                "url": "https://github.com/php-fig/event-dispatcher.git", +                "reference": "dbefd12671e8a14ec7f180cab83036ed26714bb0" +            }, +            "dist": { +                "type": "zip", +                "url": "https://api.github.com/repos/php-fig/event-dispatcher/zipball/dbefd12671e8a14ec7f180cab83036ed26714bb0", +                "reference": "dbefd12671e8a14ec7f180cab83036ed26714bb0", +                "shasum": "" +            }, +            "require": { +                "php": ">=7.2.0" +            }, +            "time": "2019-01-08T18:20:26+00:00", +            "type": "library", +            "extra": { +                "branch-alias": { +                    "dev-master": "1.0.x-dev" +                } +            }, +            "installation-source": "dist", +            "autoload": { +                "psr-4": { +                    "Psr\\EventDispatcher\\": "src/" +                } +            }, +            "notification-url": "https://packagist.org/downloads/", +            "license": [ +                "MIT" +            ], +            "authors": [ +                { +                    "name": "PHP-FIG", +                    "homepage": "http://www.php-fig.org/" +                } +            ], +            "description": "Standard interfaces for event handling.", +            "keywords": [ +                "events", +                "psr", +                "psr-14" +            ], +            "support": { +                "issues": "https://github.com/php-fig/event-dispatcher/issues", +                "source": "https://github.com/php-fig/event-dispatcher/tree/1.0.0" +            }, +            "install-path": "../psr/event-dispatcher" +        }, +        {              "name": "psr/log",              "version": "3.0.2",              "version_normalized": "3.0.2.0", @@ -1408,17 +1461,17 @@          },          {              "name": "symfony/console", -            "version": "v6.4.20", -            "version_normalized": "6.4.20.0", +            "version": "v6.4.21", +            "version_normalized": "6.4.21.0",              "source": {                  "type": "git",                  "url": "https://github.com/symfony/console.git", -                "reference": "2e4af9c952617cc3f9559ff706aee420a8464c36" +                "reference": "a3011c7b7adb58d89f6c0d822abb641d7a5f9719"              },              "dist": {                  "type": "zip", -                "url": "https://api.github.com/repos/symfony/console/zipball/2e4af9c952617cc3f9559ff706aee420a8464c36", -                "reference": "2e4af9c952617cc3f9559ff706aee420a8464c36", +                "url": "https://api.github.com/repos/symfony/console/zipball/a3011c7b7adb58d89f6c0d822abb641d7a5f9719", +                "reference": "a3011c7b7adb58d89f6c0d822abb641d7a5f9719",                  "shasum": ""              },              "require": { @@ -1451,7 +1504,7 @@                  "symfony/stopwatch": "^5.4|^6.0|^7.0",                  "symfony/var-dumper": "^5.4|^6.0|^7.0"              }, -            "time": "2025-03-03T17:16:38+00:00", +            "time": "2025-04-07T15:42:41+00:00",              "type": "library",              "installation-source": "dist",              "autoload": { @@ -1485,7 +1538,7 @@                  "terminal"              ],              "support": { -                "source": "https://github.com/symfony/console/tree/v6.4.20" +                "source": "https://github.com/symfony/console/tree/v6.4.21"              },              "funding": [                  { @@ -1574,6 +1627,168 @@              "install-path": "../symfony/deprecation-contracts"          },          { +            "name": "symfony/event-dispatcher", +            "version": "v6.4.13", +            "version_normalized": "6.4.13.0", +            "source": { +                "type": "git", +                "url": "https://github.com/symfony/event-dispatcher.git", +                "reference": "0ffc48080ab3e9132ea74ef4e09d8dcf26bf897e" +            }, +            "dist": { +                "type": "zip", +                "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/0ffc48080ab3e9132ea74ef4e09d8dcf26bf897e", +                "reference": "0ffc48080ab3e9132ea74ef4e09d8dcf26bf897e", +                "shasum": "" +            }, +            "require": { +                "php": ">=8.1", +                "symfony/event-dispatcher-contracts": "^2.5|^3" +            }, +            "conflict": { +                "symfony/dependency-injection": "<5.4", +                "symfony/service-contracts": "<2.5" +            }, +            "provide": { +                "psr/event-dispatcher-implementation": "1.0", +                "symfony/event-dispatcher-implementation": "2.0|3.0" +            }, +            "require-dev": { +                "psr/log": "^1|^2|^3", +                "symfony/config": "^5.4|^6.0|^7.0", +                "symfony/dependency-injection": "^5.4|^6.0|^7.0", +                "symfony/error-handler": "^5.4|^6.0|^7.0", +                "symfony/expression-language": "^5.4|^6.0|^7.0", +                "symfony/http-foundation": "^5.4|^6.0|^7.0", +                "symfony/service-contracts": "^2.5|^3", +                "symfony/stopwatch": "^5.4|^6.0|^7.0" +            }, +            "time": "2024-09-25T14:18:03+00:00", +            "type": "library", +            "installation-source": "dist", +            "autoload": { +                "psr-4": { +                    "Symfony\\Component\\EventDispatcher\\": "" +                }, +                "exclude-from-classmap": [ +                    "/Tests/" +                ] +            }, +            "notification-url": "https://packagist.org/downloads/", +            "license": [ +                "MIT" +            ], +            "authors": [ +                { +                    "name": "Fabien Potencier", +                    "email": "fabien@symfony.com" +                }, +                { +                    "name": "Symfony Community", +                    "homepage": "https://symfony.com/contributors" +                } +            ], +            "description": "Provides tools that allow your application components to communicate with each other by dispatching events and listening to them", +            "homepage": "https://symfony.com", +            "support": { +                "source": "https://github.com/symfony/event-dispatcher/tree/v6.4.13" +            }, +            "funding": [ +                { +                    "url": "https://symfony.com/sponsor", +                    "type": "custom" +                }, +                { +                    "url": "https://github.com/fabpot", +                    "type": "github" +                }, +                { +                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", +                    "type": "tidelift" +                } +            ], +            "install-path": "../symfony/event-dispatcher" +        }, +        { +            "name": "symfony/event-dispatcher-contracts", +            "version": "v3.5.1", +            "version_normalized": "3.5.1.0", +            "source": { +                "type": "git", +                "url": "https://github.com/symfony/event-dispatcher-contracts.git", +                "reference": "7642f5e970b672283b7823222ae8ef8bbc160b9f" +            }, +            "dist": { +                "type": "zip", +                "url": "https://api.github.com/repos/symfony/event-dispatcher-contracts/zipball/7642f5e970b672283b7823222ae8ef8bbc160b9f", +                "reference": "7642f5e970b672283b7823222ae8ef8bbc160b9f", +                "shasum": "" +            }, +            "require": { +                "php": ">=8.1", +                "psr/event-dispatcher": "^1" +            }, +            "time": "2024-09-25T14:20:29+00:00", +            "type": "library", +            "extra": { +                "thanks": { +                    "url": "https://github.com/symfony/contracts", +                    "name": "symfony/contracts" +                }, +                "branch-alias": { +                    "dev-main": "3.5-dev" +                } +            }, +            "installation-source": "dist", +            "autoload": { +                "psr-4": { +                    "Symfony\\Contracts\\EventDispatcher\\": "" +                } +            }, +            "notification-url": "https://packagist.org/downloads/", +            "license": [ +                "MIT" +            ], +            "authors": [ +                { +                    "name": "Nicolas Grekas", +                    "email": "p@tchwork.com" +                }, +                { +                    "name": "Symfony Community", +                    "homepage": "https://symfony.com/contributors" +                } +            ], +            "description": "Generic abstractions related to dispatching event", +            "homepage": "https://symfony.com", +            "keywords": [ +                "abstractions", +                "contracts", +                "decoupling", +                "interfaces", +                "interoperability", +                "standards" +            ], +            "support": { +                "source": "https://github.com/symfony/event-dispatcher-contracts/tree/v3.5.1" +            }, +            "funding": [ +                { +                    "url": "https://symfony.com/sponsor", +                    "type": "custom" +                }, +                { +                    "url": "https://github.com/fabpot", +                    "type": "github" +                }, +                { +                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", +                    "type": "tidelift" +                } +            ], +            "install-path": "../symfony/event-dispatcher-contracts" +        }, +        {              "name": "symfony/filesystem",              "version": "v6.4.13",              "version_normalized": "6.4.13.0", @@ -1711,8 +1926,8 @@          },          {              "name": "symfony/polyfill-ctype", -            "version": "v1.31.0", -            "version_normalized": "1.31.0.0", +            "version": "v1.32.0", +            "version_normalized": "1.32.0.0",              "source": {                  "type": "git",                  "url": "https://github.com/symfony/polyfill-ctype.git", @@ -1773,7 +1988,7 @@                  "portable"              ],              "support": { -                "source": "https://github.com/symfony/polyfill-ctype/tree/v1.31.0" +                "source": "https://github.com/symfony/polyfill-ctype/tree/v1.32.0"              },              "funding": [                  { @@ -1793,8 +2008,8 @@          },          {              "name": "symfony/polyfill-intl-grapheme", -            "version": "v1.31.0", -            "version_normalized": "1.31.0.0", +            "version": "v1.32.0", +            "version_normalized": "1.32.0.0",              "source": {                  "type": "git",                  "url": "https://github.com/symfony/polyfill-intl-grapheme.git", @@ -1854,7 +2069,7 @@                  "shim"              ],              "support": { -                "source": "https://github.com/symfony/polyfill-intl-grapheme/tree/v1.31.0" +                "source": "https://github.com/symfony/polyfill-intl-grapheme/tree/v1.32.0"              },              "funding": [                  { @@ -1874,8 +2089,8 @@          },          {              "name": "symfony/polyfill-intl-normalizer", -            "version": "v1.31.0", -            "version_normalized": "1.31.0.0", +            "version": "v1.32.0", +            "version_normalized": "1.32.0.0",              "source": {                  "type": "git",                  "url": "https://github.com/symfony/polyfill-intl-normalizer.git", @@ -1938,7 +2153,7 @@                  "shim"              ],              "support": { -                "source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.31.0" +                "source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.32.0"              },              "funding": [                  { @@ -1958,20 +2173,21 @@          },          {              "name": "symfony/polyfill-mbstring", -            "version": "v1.31.0", -            "version_normalized": "1.31.0.0", +            "version": "v1.32.0", +            "version_normalized": "1.32.0.0",              "source": {                  "type": "git",                  "url": "https://github.com/symfony/polyfill-mbstring.git", -                "reference": "85181ba99b2345b0ef10ce42ecac37612d9fd341" +                "reference": "6d857f4d76bd4b343eac26d6b539585d2bc56493"              },              "dist": {                  "type": "zip", -                "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/85181ba99b2345b0ef10ce42ecac37612d9fd341", -                "reference": "85181ba99b2345b0ef10ce42ecac37612d9fd341", +                "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/6d857f4d76bd4b343eac26d6b539585d2bc56493", +                "reference": "6d857f4d76bd4b343eac26d6b539585d2bc56493",                  "shasum": ""              },              "require": { +                "ext-iconv": "*",                  "php": ">=7.2"              },              "provide": { @@ -1980,7 +2196,7 @@              "suggest": {                  "ext-mbstring": "For best performance"              }, -            "time": "2024-09-09T11:45:10+00:00", +            "time": "2024-12-23T08:48:59+00:00",              "type": "library",              "extra": {                  "thanks": { @@ -2021,7 +2237,7 @@                  "shim"              ],              "support": { -                "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.31.0" +                "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.32.0"              },              "funding": [                  { @@ -2191,17 +2407,17 @@          },          {              "name": "symfony/string", -            "version": "v6.4.15", -            "version_normalized": "6.4.15.0", +            "version": "v6.4.21", +            "version_normalized": "6.4.21.0",              "source": {                  "type": "git",                  "url": "https://github.com/symfony/string.git", -                "reference": "73a5e66ea2e1677c98d4449177c5a9cf9d8b4c6f" +                "reference": "73e2c6966a5aef1d4892873ed5322245295370c6"              },              "dist": {                  "type": "zip", -                "url": "https://api.github.com/repos/symfony/string/zipball/73a5e66ea2e1677c98d4449177c5a9cf9d8b4c6f", -                "reference": "73a5e66ea2e1677c98d4449177c5a9cf9d8b4c6f", +                "url": "https://api.github.com/repos/symfony/string/zipball/73e2c6966a5aef1d4892873ed5322245295370c6", +                "reference": "73e2c6966a5aef1d4892873ed5322245295370c6",                  "shasum": ""              },              "require": { @@ -2221,7 +2437,7 @@                  "symfony/translation-contracts": "^2.5|^3.0",                  "symfony/var-exporter": "^5.4|^6.0|^7.0"              }, -            "time": "2024-11-13T13:31:12+00:00", +            "time": "2025-04-18T15:23:29+00:00",              "type": "library",              "installation-source": "dist",              "autoload": { @@ -2260,7 +2476,7 @@                  "utf8"              ],              "support": { -                "source": "https://github.com/symfony/string/tree/v6.4.15" +                "source": "https://github.com/symfony/string/tree/v6.4.21"              },              "funding": [                  { diff --git a/pie-rpm.patch b/pie-rpm.patch index bce68f7..319bf15 100644 --- a/pie-rpm.patch +++ b/pie-rpm.patch @@ -1,8 +1,8 @@  diff -up ./bin/pie.rpm ./bin/pie ---- ./bin/pie.rpm	2024-10-04 11:40:48.733248660 +0200 -+++ ./bin/pie	2024-10-04 11:42:00.473990273 +0200 -@@ -17,7 +17,7 @@ use Symfony\Component\Console\Input\Inpu - use Symfony\Component\Console\Output\OutputInterface; +--- ./bin/pie.rpm	2025-05-04 07:07:22.613769884 +0200 ++++ ./bin/pie	2025-05-04 07:08:14.674780350 +0200 +@@ -25,7 +25,7 @@ use Symfony\Component\Console\Output\Out + use Symfony\Component\EventDispatcher\EventDispatcher;   /** @psalm-suppress UnresolvableInclude */  -include $_composer_autoload_path ?? __DIR__ . '/../vendor/autoload.php'; @@ -10,14 +10,25 @@ diff -up ./bin/pie.rpm ./bin/pie   $container = Container::factory(); -diff -up ./src/Command/SelfUpdateCommand.php.old ./src/Command/SelfUpdateCommand.php ---- ./src/Command/SelfUpdateCommand.php.old	2025-04-15 08:39:08.283938705 +0200 -+++ ./src/Command/SelfUpdateCommand.php	2025-04-15 08:40:47.169189092 +0200 -@@ -66,6 +66,7 @@ final class SelfUpdateCommand extends Co +diff -up ./src/Command/SelfUpdateCommand.php.rpm ./src/Command/SelfUpdateCommand.php +--- ./src/Command/SelfUpdateCommand.php.rpm	2025-05-04 07:07:22.613884103 +0200 ++++ ./src/Command/SelfUpdateCommand.php	2025-05-04 07:08:42.762882203 +0200 +@@ -63,6 +63,7 @@ final class SelfUpdateCommand extends Co       {           if (! PieVersion::isPharBuild()) {               $output->writeln('<comment>Aborting! You are not running a PHAR, cannot self-update.</comment>');  +            $output->writeln('<comment>Update the pie RPM using the package manager (dnf).</comment>'); -             return 1; +             return Command::FAILURE; +         } +diff -up ./src/Command/SelfVerifyCommand.php.rpm ./src/Command/SelfVerifyCommand.php +--- ./src/Command/SelfVerifyCommand.php.rpm	2025-05-04 07:12:21.285478859 +0200 ++++ ./src/Command/SelfVerifyCommand.php	2025-05-04 07:14:06.624616100 +0200 +@@ -49,6 +49,7 @@ final class SelfVerifyCommand extends Co +     { +         if (! PieVersion::isPharBuild()) { +             $output->writeln('<comment>Aborting! You are not running a PHAR, cannot self-verify.</comment>'); ++            $output->writeln('<comment>Verify the pie RPM using the package manager (rpm).</comment>'); +  +             return Command::FAILURE;           } @@ -11,14 +11,14 @@  # For compatibility with SCL  %undefine __brp_mangle_shebangs -%global gh_commit        2c73701769a0edffd1f5f051b658f1ac31c78c64 +%global gh_commit        453a46225915d29c714480d4897b7905d91c3236  %global gh_short         %(c=%{gh_commit}; echo ${c:0:7})  #global gh_date		     20241003  %global gh_branch        main  %global gh_owner         php  %global gh_project       pie -%global upstream_version 0.9.0 +%global upstream_version 0.10.0  #global upstream_prever  dev  #global upstream_lower   DEV @@ -28,7 +28,7 @@  Name:           pie  Version:        %{upstream_version}%{?upstream_prever:~%{upstream_lower}} -Release:        2%{?dist} +Release:        1%{?dist}  Summary:        PHP Installer for Extensions  # SPDX: pie is BSD-3-Clause, all dependencies are MIT @@ -140,6 +140,9 @@ done  %changelog +* Sun May  4 2025 Remi Collet <remi@remirepo.net> - 0.10.0-1 +- update to 0.10.0 +  * Tue Apr 15 2025 Remi Collet <remi@remirepo.net> - 0.9.0-2  - update to 0.9.0  - add notice about dnf in self-update output  | 
