summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <remi@remirepo.net>2025-04-15 08:57:27 +0200
committerRemi Collet <remi@php.net>2025-04-15 08:57:27 +0200
commit8a79d938826da670e57606f5c16be69df31b7530 (patch)
treeead59d8a90df92eb2a68b4e41eba412590ba2c52
parentf423166734ce72ee3db85b131355faf080630bc9 (diff)
update to 0.9.0HEADmaster
add notice about dnf in self-update output open https://github.com/php/pie/issues/217 broken bash completion
-rw-r--r--composer.json11
-rw-r--r--installed.json166
-rw-r--r--pie-rpm.patch11
-rw-r--r--pie.spec12
4 files changed, 152 insertions, 48 deletions
diff --git a/composer.json b/composer.json
index cdc2c60..12d276b 100644
--- a/composer.json
+++ b/composer.json
@@ -34,16 +34,17 @@
"fidry/cpu-core-counter": "^1.2",
"illuminate/container": "^10.48.28",
"psr/container": "^2.0.2",
- "symfony/console": "^6.4.17",
- "symfony/process": "^6.4.19",
+ "symfony/console": "^6.4.20",
+ "symfony/process": "^6.4.20",
"webmozart/assert": "^1.11"
},
"require-dev": {
+ "ext-openssl": "*",
"behat/behat": "^3.19.0",
- "doctrine/coding-standard": "^12.0",
+ "doctrine/coding-standard": "^13.0",
"phpunit/phpunit": "^10.5.45",
- "psalm/plugin-phpunit": "^0.19.2",
- "vimeo/psalm": "^6.8.8"
+ "psalm/plugin-phpunit": "^0.19.5",
+ "vimeo/psalm": "^6.10.0"
},
"replace": {
"symfony/polyfill-php81": "*",
diff --git a/installed.json b/installed.json
index 7e4dc38..dbf8a86 100644
--- a/installed.json
+++ b/installed.json
@@ -81,17 +81,17 @@
},
{
"name": "composer/class-map-generator",
- "version": "1.6.0",
- "version_normalized": "1.6.0.0",
+ "version": "1.6.1",
+ "version_normalized": "1.6.1.0",
"source": {
"type": "git",
"url": "https://github.com/composer/class-map-generator.git",
- "reference": "ffe442c5974c44a9343e37a0abcb1cc37319f5b9"
+ "reference": "134b705ddb0025d397d8318a75825fe3c9d1da34"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/composer/class-map-generator/zipball/ffe442c5974c44a9343e37a0abcb1cc37319f5b9",
- "reference": "ffe442c5974c44a9343e37a0abcb1cc37319f5b9",
+ "url": "https://api.github.com/repos/composer/class-map-generator/zipball/134b705ddb0025d397d8318a75825fe3c9d1da34",
+ "reference": "134b705ddb0025d397d8318a75825fe3c9d1da34",
"shasum": ""
},
"require": {
@@ -107,7 +107,7 @@
"phpunit/phpunit": "^8",
"symfony/filesystem": "^5.4 || ^6"
},
- "time": "2025-02-05T10:05:34+00:00",
+ "time": "2025-03-24T13:50:44+00:00",
"type": "library",
"extra": {
"branch-alias": {
@@ -137,7 +137,7 @@
],
"support": {
"issues": "https://github.com/composer/class-map-generator/issues",
- "source": "https://github.com/composer/class-map-generator/tree/1.6.0"
+ "source": "https://github.com/composer/class-map-generator/tree/1.6.1"
},
"funding": [
{
@@ -157,17 +157,17 @@
},
{
"name": "composer/composer",
- "version": "2.8.6",
- "version_normalized": "2.8.6.0",
+ "version": "2.8.8",
+ "version_normalized": "2.8.8.0",
"source": {
"type": "git",
"url": "https://github.com/composer/composer.git",
- "reference": "937c775a644bd7d2c3dfbb352747488463a6e673"
+ "reference": "85ff84d6c5260ba21740a7c5c9a111890805d6e7"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/composer/composer/zipball/937c775a644bd7d2c3dfbb352747488463a6e673",
- "reference": "937c775a644bd7d2c3dfbb352747488463a6e673",
+ "url": "https://api.github.com/repos/composer/composer/zipball/85ff84d6c5260ba21740a7c5c9a111890805d6e7",
+ "reference": "85ff84d6c5260ba21740a7c5c9a111890805d6e7",
"shasum": ""
},
"require": {
@@ -178,7 +178,7 @@
"composer/semver": "^3.3",
"composer/spdx-licenses": "^1.5.7",
"composer/xdebug-handler": "^2.0.2 || ^3.0.3",
- "justinrainbow/json-schema": "^5.3",
+ "justinrainbow/json-schema": "^6.3.1",
"php": "^7.2.5 || ^8.0",
"psr/log": "^1.0 || ^2.0 || ^3.0",
"react/promise": "^2.11 || ^3.2",
@@ -206,7 +206,7 @@
"ext-zip": "Enabling the zip extension allows you to unzip archives",
"ext-zlib": "Allow gzip compression of HTTP requests"
},
- "time": "2025-02-25T12:03:50+00:00",
+ "time": "2025-04-04T14:56:46+00:00",
"bin": [
"bin/composer"
],
@@ -254,7 +254,7 @@
"irc": "ircs://irc.libera.chat:6697/composer",
"issues": "https://github.com/composer/composer/issues",
"security": "https://github.com/composer/composer/security/policy",
- "source": "https://github.com/composer/composer/tree/2.8.6"
+ "source": "https://github.com/composer/composer/tree/2.8.8"
},
"funding": [
{
@@ -833,32 +833,42 @@
},
{
"name": "justinrainbow/json-schema",
- "version": "5.3.0",
- "version_normalized": "5.3.0.0",
+ "version": "6.4.1",
+ "version_normalized": "6.4.1.0",
"source": {
"type": "git",
"url": "https://github.com/jsonrainbow/json-schema.git",
- "reference": "feb2ca6dd1cebdaf1ed60a4c8de2e53ce11c4fd8"
+ "reference": "35d262c94959571e8736db1e5c9bc36ab94ae900"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/jsonrainbow/json-schema/zipball/feb2ca6dd1cebdaf1ed60a4c8de2e53ce11c4fd8",
- "reference": "feb2ca6dd1cebdaf1ed60a4c8de2e53ce11c4fd8",
+ "url": "https://api.github.com/repos/jsonrainbow/json-schema/zipball/35d262c94959571e8736db1e5c9bc36ab94ae900",
+ "reference": "35d262c94959571e8736db1e5c9bc36ab94ae900",
"shasum": ""
},
"require": {
- "php": ">=7.1"
+ "ext-json": "*",
+ "marc-mabe/php-enum": "^4.0",
+ "php": "^7.2 || ^8.0"
},
"require-dev": {
- "friendsofphp/php-cs-fixer": "~2.2.20||~2.15.1",
+ "friendsofphp/php-cs-fixer": "3.3.0",
"json-schema/json-schema-test-suite": "1.2.0",
- "phpunit/phpunit": "^4.8.35"
+ "marc-mabe/php-enum-phpstan": "^2.0",
+ "phpspec/prophecy": "^1.19",
+ "phpstan/phpstan": "^1.12",
+ "phpunit/phpunit": "^8.5"
},
- "time": "2024-07-06T21:00:26+00:00",
+ "time": "2025-04-04T13:08:07+00:00",
"bin": [
"bin/validate-json"
],
"type": "library",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "6.x-dev"
+ }
+ },
"installation-source": "dist",
"autoload": {
"psr-4": {
@@ -888,18 +898,94 @@
}
],
"description": "A library to validate a json schema.",
- "homepage": "https://github.com/justinrainbow/json-schema",
+ "homepage": "https://github.com/jsonrainbow/json-schema",
"keywords": [
"json",
"schema"
],
"support": {
"issues": "https://github.com/jsonrainbow/json-schema/issues",
- "source": "https://github.com/jsonrainbow/json-schema/tree/5.3.0"
+ "source": "https://github.com/jsonrainbow/json-schema/tree/6.4.1"
},
"install-path": "../justinrainbow/json-schema"
},
{
+ "name": "marc-mabe/php-enum",
+ "version": "v4.7.1",
+ "version_normalized": "4.7.1.0",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/marc-mabe/php-enum.git",
+ "reference": "7159809e5cfa041dca28e61f7f7ae58063aae8ed"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/marc-mabe/php-enum/zipball/7159809e5cfa041dca28e61f7f7ae58063aae8ed",
+ "reference": "7159809e5cfa041dca28e61f7f7ae58063aae8ed",
+ "shasum": ""
+ },
+ "require": {
+ "ext-reflection": "*",
+ "php": "^7.1 | ^8.0"
+ },
+ "require-dev": {
+ "phpbench/phpbench": "^0.16.10 || ^1.0.4",
+ "phpstan/phpstan": "^1.3.1",
+ "phpunit/phpunit": "^7.5.20 | ^8.5.22 | ^9.5.11",
+ "vimeo/psalm": "^4.17.0 | ^5.26.1"
+ },
+ "time": "2024-11-28T04:54:44+00:00",
+ "type": "library",
+ "extra": {
+ "branch-alias": {
+ "dev-3.x": "3.2-dev",
+ "dev-master": "4.7-dev"
+ }
+ },
+ "installation-source": "dist",
+ "autoload": {
+ "psr-4": {
+ "MabeEnum\\": "src/"
+ },
+ "classmap": [
+ "stubs/Stringable.php"
+ ]
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "BSD-3-Clause"
+ ],
+ "authors": [
+ {
+ "name": "Marc Bennewitz",
+ "email": "dev@mabe.berlin",
+ "homepage": "https://mabe.berlin/",
+ "role": "Lead"
+ }
+ ],
+ "description": "Simple and fast implementation of enumerations with native PHP",
+ "homepage": "https://github.com/marc-mabe/php-enum",
+ "keywords": [
+ "enum",
+ "enum-map",
+ "enum-set",
+ "enumeration",
+ "enumerator",
+ "enummap",
+ "enumset",
+ "map",
+ "set",
+ "type",
+ "type-hint",
+ "typehint"
+ ],
+ "support": {
+ "issues": "https://github.com/marc-mabe/php-enum/issues",
+ "source": "https://github.com/marc-mabe/php-enum/tree/v4.7.1"
+ },
+ "install-path": "../marc-mabe/php-enum"
+ },
+ {
"name": "psr/container",
"version": "2.0.2",
"version_normalized": "2.0.2.0",
@@ -1322,17 +1408,17 @@
},
{
"name": "symfony/console",
- "version": "v6.4.17",
- "version_normalized": "6.4.17.0",
+ "version": "v6.4.20",
+ "version_normalized": "6.4.20.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/console.git",
- "reference": "799445db3f15768ecc382ac5699e6da0520a0a04"
+ "reference": "2e4af9c952617cc3f9559ff706aee420a8464c36"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/console/zipball/799445db3f15768ecc382ac5699e6da0520a0a04",
- "reference": "799445db3f15768ecc382ac5699e6da0520a0a04",
+ "url": "https://api.github.com/repos/symfony/console/zipball/2e4af9c952617cc3f9559ff706aee420a8464c36",
+ "reference": "2e4af9c952617cc3f9559ff706aee420a8464c36",
"shasum": ""
},
"require": {
@@ -1365,7 +1451,7 @@
"symfony/stopwatch": "^5.4|^6.0|^7.0",
"symfony/var-dumper": "^5.4|^6.0|^7.0"
},
- "time": "2024-12-07T12:07:30+00:00",
+ "time": "2025-03-03T17:16:38+00:00",
"type": "library",
"installation-source": "dist",
"autoload": {
@@ -1399,7 +1485,7 @@
"terminal"
],
"support": {
- "source": "https://github.com/symfony/console/tree/v6.4.17"
+ "source": "https://github.com/symfony/console/tree/v6.4.20"
},
"funding": [
{
@@ -1955,23 +2041,23 @@
},
{
"name": "symfony/process",
- "version": "v6.4.19",
- "version_normalized": "6.4.19.0",
+ "version": "v6.4.20",
+ "version_normalized": "6.4.20.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/process.git",
- "reference": "7a1c12e87b08ec9c97abdd188c9b3f5a40e37fc3"
+ "reference": "e2a61c16af36c9a07e5c9906498b73e091949a20"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/process/zipball/7a1c12e87b08ec9c97abdd188c9b3f5a40e37fc3",
- "reference": "7a1c12e87b08ec9c97abdd188c9b3f5a40e37fc3",
+ "url": "https://api.github.com/repos/symfony/process/zipball/e2a61c16af36c9a07e5c9906498b73e091949a20",
+ "reference": "e2a61c16af36c9a07e5c9906498b73e091949a20",
"shasum": ""
},
"require": {
"php": ">=8.1"
},
- "time": "2025-02-04T13:35:48+00:00",
+ "time": "2025-03-10T17:11:00+00:00",
"type": "library",
"installation-source": "dist",
"autoload": {
@@ -1999,7 +2085,7 @@
"description": "Executes commands in sub-processes",
"homepage": "https://symfony.com",
"support": {
- "source": "https://github.com/symfony/process/tree/v6.4.19"
+ "source": "https://github.com/symfony/process/tree/v6.4.20"
},
"funding": [
{
diff --git a/pie-rpm.patch b/pie-rpm.patch
index e73d0ab..bce68f7 100644
--- a/pie-rpm.patch
+++ b/pie-rpm.patch
@@ -10,3 +10,14 @@ 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
+ {
+ 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;
+ }
diff --git a/pie.spec b/pie.spec
index ae55fa5..8fc61b2 100644
--- a/pie.spec
+++ b/pie.spec
@@ -11,14 +11,14 @@
# For compatibility with SCL
%undefine __brp_mangle_shebangs
-%global gh_commit 108707df748ad2bbc96db8a1edd625b4332c364e
+%global gh_commit 2c73701769a0edffd1f5f051b658f1ac31c78c64
%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.8.0
+%global upstream_version 0.9.0
#global upstream_prever dev
#global upstream_lower DEV
@@ -28,7 +28,7 @@
Name: pie
Version: %{upstream_version}%{?upstream_prever:~%{upstream_lower}}
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: PHP Installer for Extensions
# SPDX: pie is BSD-3-Clause, all dependencies are MIT
@@ -41,6 +41,7 @@ Source1: %{name}-bash-completion
Source9: makesrc.sh
# Fix autoloader path
+# add message about dnf in self-update command
Patch0: %{name}-rpm.patch
# Don't use XDG directories
Patch1: %{name}-noxdg.patch
@@ -139,6 +140,11 @@ done
%changelog
+* 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
+- open https://github.com/php/pie/issues/217 broken bash completion
+
* Thu Mar 13 2025 Remi Collet <remi@remirepo.net> - 0.8.0-1
- update to 0.8.0