Update laminas-progressbar to a custom fork

see laminas/laminas-progressbar#14

diff --git a/wcfsetup/install/files/lib/system/api/composer.json b/wcfsetup/install/files/lib/system/api/composer.json
index 9d91415e331f45ca14adb4cb6a8c5b5c27e38acb..2b70e9cb9ae80075fde83c857b981dbdfb15292b 100644 (file)
--- a/wcfsetup/install/files/lib/system/api/composer.json
+++ b/wcfsetup/install/files/lib/system/api/composer.json
@@ -16,7 +16,7 @@
         "guzzlehttp/psr7": "^2.2.1",
         "laminas/laminas-diactoros": "^2.4.1",
         "laminas/laminas-httphandlerrunner": "^1.2.0",
-        "laminas/laminas-progressbar": "^2.7.0",
+        "laminas/laminas-progressbar": "dev-woltlab-2.7 as 2.7.0",
         "paragonie/constant_time_encoding": "^2.5.0",
         "pear/net_idna2": "^0.2.0",
         "pelago/emogrifier": "^6.0.0",
@@ -25,5 +25,12 @@
         "symfony/polyfill-php74": "^1.25.0",
         "symfony/polyfill-php80": "^1.25.0",
         "true/punycode": "^2.1.1"
-    }
+    },
+    "repositories": [
+        {
+            "type": "vcs",
+            "url": "https://github.com/WoltLab/laminas-progressbar",
+            "no-api": true
+        }
+    ]
 }

diff --git a/wcfsetup/install/files/lib/system/api/composer.lock b/wcfsetup/install/files/lib/system/api/composer.lock
index 4d6d72a0c2867c8c780c1c6df892cc3cf0ecf7d4..b139349b7f0713939a17d91fcc21183da12a347c 100644 (file)
--- a/wcfsetup/install/files/lib/system/api/composer.lock
+++ b/wcfsetup/install/files/lib/system/api/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "da96a6eb84699802cec74c683a04a5b4",
+    "content-hash": "836a66a86bbfd8648a43ee713302f774",
     "packages": [
         {
             "name": "chrisjean/php-ico",
@@ -651,16 +651,16 @@
         },
         {
             "name": "laminas/laminas-progressbar",
-            "version": "2.7.0",
+            "version": "dev-woltlab-2.7",
             "source": {
                 "type": "git",
-                "url": "https://github.com/laminas/laminas-progressbar.git",
-                "reference": "15f9e983276462f30d7d38660dc7488c6e3df34b"
+                "url": "https://github.com/WoltLab/laminas-progressbar",
+                "reference": "3c61cf5698fe537a0cd1984d0d711bb98b2babde"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/laminas/laminas-progressbar/zipball/15f9e983276462f30d7d38660dc7488c6e3df34b",
-                "reference": "15f9e983276462f30d7d38660dc7488c6e3df34b",
+                "url": "https://api.github.com/repos/WoltLab/laminas-progressbar/zipball/3c61cf5698fe537a0cd1984d0d711bb98b2babde",
+                "reference": "3c61cf5698fe537a0cd1984d0d711bb98b2babde",
                 "shasum": ""
             },
             "require": {
@@ -669,7 +669,7 @@
                 "php": "^5.6 || ^7.0"
             },
             "replace": {
-                "zendframework/zend-progressbar": "self.version"
+                "zendframework/zend-progressbar": "^2.7.0"
             },
             "require-dev": {
                 "laminas/laminas-coding-standard": "~1.0.0",
@@ -682,18 +682,34 @@
                 "laminas/laminas-session": "To support progressbar persistent"
             },
             "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "2.7.x-dev",
-                    "dev-develop": "2.8.x-dev"
-                }
-            },
             "autoload": {
                 "psr-4": {
                     "Laminas\\ProgressBar\\": "src/"
                 }
             },
-            "notification-url": "https://packagist.org/downloads/",
+            "autoload-dev": {
+                "psr-4": {
+                    "LaminasTest\\ProgressBar\\": "test/"
+                }
+            },
+            "scripts": {
+                "check": [
+                    "@cs-check",
+                    "@test"
+                ],
+                "cs-check": [
+                    "phpcs"
+                ],
+                "cs-fix": [
+                    "phpcbf"
+                ],
+                "test": [
+                    "phpunit --colors=always"
+                ],
+                "test-coverage": [
+                    "phpunit --colors=always --coverage-clover clover.xml"
+                ]
+            },
             "license": [
                 "BSD-3-Clause"
             ],
@@ -704,14 +720,14 @@
                 "progressbar"
             ],
             "support": {
-                "chat": "https://laminas.dev/chat",
                 "docs": "https://docs.laminas.dev/laminas-progressbar/",
-                "forum": "https://discourse.laminas.dev",
                 "issues": "https://github.com/laminas/laminas-progressbar/issues",
+                "source": "https://github.com/laminas/laminas-progressbar",
                 "rss": "https://github.com/laminas/laminas-progressbar/releases.atom",
-                "source": "https://github.com/laminas/laminas-progressbar"
+                "chat": "https://laminas.dev/chat",
+                "forum": "https://discourse.laminas.dev"
             },
-            "time": "2019-12-31T17:38:44+00:00"
+            "time": "2022-07-28T08:13:03+00:00"
         },
         {
             "name": "laminas/laminas-stdlib",
@@ -1991,9 +2007,18 @@
         }
     ],
     "packages-dev": [],
-    "aliases": [],
+    "aliases": [
+        {
+            "package": "laminas/laminas-progressbar",
+            "version": "dev-woltlab-2.7",
+            "alias": "2.7.0",
+            "alias_normalized": "2.7.0.0"
+        }
+    ],
     "minimum-stability": "stable",
-    "stability-flags": [],
+    "stability-flags": {
+        "laminas/laminas-progressbar": 20
+    },
     "prefer-stable": false,
     "prefer-lowest": false,
     "platform": [],

diff --git a/wcfsetup/install/files/lib/system/api/composer/installed.json b/wcfsetup/install/files/lib/system/api/composer/installed.json
index a427081871880665459d35aa6ac9518c17b2fe6f..3350c7247b414a98ac26532aba569c6213a4ebbf 100644 (file)
--- a/wcfsetup/install/files/lib/system/api/composer/installed.json
+++ b/wcfsetup/install/files/lib/system/api/composer/installed.json
@@ -661,17 +661,17 @@
         },
         {
             "name": "laminas/laminas-progressbar",
-            "version": "2.7.0",
-            "version_normalized": "2.7.0.0",
+            "version": "dev-woltlab-2.7",
+            "version_normalized": "dev-woltlab-2.7",
             "source": {
                 "type": "git",
-                "url": "https://github.com/laminas/laminas-progressbar.git",
-                "reference": "15f9e983276462f30d7d38660dc7488c6e3df34b"
+                "url": "https://github.com/WoltLab/laminas-progressbar",
+                "reference": "3c61cf5698fe537a0cd1984d0d711bb98b2babde"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/laminas/laminas-progressbar/zipball/15f9e983276462f30d7d38660dc7488c6e3df34b",
-                "reference": "15f9e983276462f30d7d38660dc7488c6e3df34b",
+                "url": "https://api.github.com/repos/WoltLab/laminas-progressbar/zipball/3c61cf5698fe537a0cd1984d0d711bb98b2babde",
+                "reference": "3c61cf5698fe537a0cd1984d0d711bb98b2babde",
                 "shasum": ""
             },
             "require": {
@@ -680,7 +680,7 @@
                 "php": "^5.6 || ^7.0"
             },
             "replace": {
-                "zendframework/zend-progressbar": "self.version"
+                "zendframework/zend-progressbar": "^2.7.0"
             },
             "require-dev": {
                 "laminas/laminas-coding-standard": "~1.0.0",
@@ -692,21 +692,37 @@
                 "laminas/laminas-json": "Laminas\\Json component",
                 "laminas/laminas-session": "To support progressbar persistent"
             },
-            "time": "2019-12-31T17:38:44+00:00",
+            "time": "2022-07-28T08:13:03+00:00",
             "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "2.7.x-dev",
-                    "dev-develop": "2.8.x-dev"
-                }
-            },
             "installation-source": "dist",
             "autoload": {
                 "psr-4": {
                     "Laminas\\ProgressBar\\": "src/"
                 }
             },
-            "notification-url": "https://packagist.org/downloads/",
+            "autoload-dev": {
+                "psr-4": {
+                    "LaminasTest\\ProgressBar\\": "test/"
+                }
+            },
+            "scripts": {
+                "check": [
+                    "@cs-check",
+                    "@test"
+                ],
+                "cs-check": [
+                    "phpcs"
+                ],
+                "cs-fix": [
+                    "phpcbf"
+                ],
+                "test": [
+                    "phpunit --colors=always"
+                ],
+                "test-coverage": [
+                    "phpunit --colors=always --coverage-clover clover.xml"
+                ]
+            },
             "license": [
                 "BSD-3-Clause"
             ],
@@ -717,12 +733,12 @@
                 "progressbar"
             ],
             "support": {
-                "chat": "https://laminas.dev/chat",
                 "docs": "https://docs.laminas.dev/laminas-progressbar/",
-                "forum": "https://discourse.laminas.dev",
                 "issues": "https://github.com/laminas/laminas-progressbar/issues",
+                "source": "https://github.com/laminas/laminas-progressbar",
                 "rss": "https://github.com/laminas/laminas-progressbar/releases.atom",
-                "source": "https://github.com/laminas/laminas-progressbar"
+                "chat": "https://laminas.dev/chat",
+                "forum": "https://discourse.laminas.dev"
             },
             "install-path": "../laminas/laminas-progressbar"
         },

diff --git a/wcfsetup/install/files/lib/system/api/composer/installed.php b/wcfsetup/install/files/lib/system/api/composer/installed.php
index e0156b0e6421387c196b3315ab98eb77070ce93b..f147c260812a9b81aab7cd300b000238ab69dc57 100644 (file)
--- a/wcfsetup/install/files/lib/system/api/composer/installed.php
+++ b/wcfsetup/install/files/lib/system/api/composer/installed.php
@@ -92,9 +92,9 @@
             'dev_requirement' => false,
         ),
         'laminas/laminas-progressbar' => array(
-            'pretty_version' => '2.7.0',
-            'version' => '2.7.0.0',
-            'reference' => '15f9e983276462f30d7d38660dc7488c6e3df34b',
+            'pretty_version' => 'dev-woltlab-2.7',
+            'version' => 'dev-woltlab-2.7',
+            'reference' => '3c61cf5698fe537a0cd1984d0d711bb98b2babde',
             'type' => 'library',
             'install_path' => __DIR__ . '/../laminas/laminas-progressbar',
             'aliases' => array(),
@@ -313,7 +313,7 @@
         'zendframework/zend-progressbar' => array(
             'dev_requirement' => false,
             'replaced' => array(
-                0 => '2.7.0',
+                0 => '^2.7.0',
             ),
         ),
         'zendframework/zend-stdlib' => array(

diff --git a/wcfsetup/install/files/lib/system/api/laminas/laminas-progressbar/CHANGELOG.md b/wcfsetup/install/files/lib/system/api/laminas/laminas-progressbar/CHANGELOG.md
deleted file mode 100644 (file)
index 1ceedab..0000000
--- a/wcfsetup/install/files/lib/system/api/laminas/laminas-progressbar/CHANGELOG.md
+++ /dev/null
@@ -1,71 +0,0 @@
-# Changelog
-
-All notable changes to this project will be documented in this file, in reverse chronological order by release.
-
-## 2.7.0 - 2019-10-17
-
-### Added
-
-- [zendframework/zend-progressbar#27](https://github.com/zendframework/zend-progressbar/pull/27) adds support for PHP 7.3.
-
-### Changed
-
-- Nothing.
-
-### Deprecated
-
-- Nothing.
-
-### Removed
-
-- [zendframework/zend-progressbar#27](https://github.com/zendframework/zend-progressbar/pull/27) removes support for laminas-stdlib v2 releases.
-
-### Fixed
-
-- Nothing.
-
-## 2.6.0 - 2018-04-30
-
-### Added
-
-- [zendframework/zend-progressbar#25](https://github.com/zendframework/zend-progressbar/pull/25) adds support for PHP 7.1 and 7.2.
-
-- [zendframework/zend-progressbar#17](https://github.com/zendframework/zend-progressbar/pull/17) adds and
-  publishes the documentation to https://docs.laminas.dev/laminas-progressbar/
-
-### Changed
-
-- Nothing.
-
-### Deprecated
-
-- Nothing.
-
-### Removed
-
-- [zendframework/zend-progressbar#25](https://github.com/zendframework/zend-progressbar/pull/25) removes support for PHP 5.5.
-
-- [zendframework/zend-progressbar#25](https://github.com/zendframework/zend-progressbar/pull/25) removes support for HHVM.
-
-### Fixed
-
-- Nothing.
-
-## 2.5.2 - 2016-03-01
-
-### Added
-
-- Nothing.
-
-### Deprecated
-
-- Nothing.
-
-### Removed
-
-- Nothing.
-
-### Fixed
-
-- [zendframework/zend-progressbar#10](https://github.com/zendframework/zend-progressbar/pull/10) updates
-  dependencies to allow forward-compatibility with laminas-stdlib 3.

diff --git a/wcfsetup/install/files/lib/system/api/laminas/laminas-progressbar/COPYRIGHT.md b/wcfsetup/install/files/lib/system/api/laminas/laminas-progressbar/COPYRIGHT.md
index c4fc4fee199c81b0fbca88d460bcd878e194c984..0a8cccc06bfa04935c37edde9b9923507da6126b 100644 (file)
--- a/wcfsetup/install/files/lib/system/api/laminas/laminas-progressbar/COPYRIGHT.md
+++ b/wcfsetup/install/files/lib/system/api/laminas/laminas-progressbar/COPYRIGHT.md
@@ -1,2 +1 @@
-Copyright (c) 2019, Laminas Foundation.
-All rights reserved. (https://getlaminas.org/)
+Copyright (c) 2020 Laminas Project a Series of LF Projects, LLC. (https://getlaminas.org/)

diff --git a/wcfsetup/install/files/lib/system/api/laminas/laminas-progressbar/LICENSE.md b/wcfsetup/install/files/lib/system/api/laminas/laminas-progressbar/LICENSE.md
index 09f53edc11978b12a37a1fa1ba80109bb061f704..10b40f1423b53b3138f9eb7db2db0698ba102c9a 100644 (file)
--- a/wcfsetup/install/files/lib/system/api/laminas/laminas-progressbar/LICENSE.md
+++ b/wcfsetup/install/files/lib/system/api/laminas/laminas-progressbar/LICENSE.md
@@ -1,5 +1,4 @@
-Copyright (c) 2019, Laminas Foundation
-All rights reserved.
+Copyright (c) 2020 Laminas Project a Series of LF Projects, LLC.
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are met:

diff --git a/wcfsetup/install/files/lib/system/api/laminas/laminas-progressbar/README.md b/wcfsetup/install/files/lib/system/api/laminas/laminas-progressbar/README.md
index 0c738cd9640ee29ce4327c29c1f52a4f7166cf65..f173f3a3fb0309495cb71907ce1b152c39a3ba18 100644 (file)
--- a/wcfsetup/install/files/lib/system/api/laminas/laminas-progressbar/README.md
+++ b/wcfsetup/install/files/lib/system/api/laminas/laminas-progressbar/README.md
@@ -1,7 +1,6 @@
 # laminas-progressbar
 
-[![Build Status](https://travis-ci.org/laminas/laminas-progressbar.svg?branch=master)](https://travis-ci.org/laminas/laminas-progressbar)
-[![Coverage Status](https://coveralls.io/repos/github/laminas/laminas-progressbar/badge.svg?branch=master)](https://coveralls.io/github/laminas/laminas-progressbar?branch=master)
+[![Build Status](https://github.com/laminas/laminas-progressbar/workflows/Continuous%20Integration/badge.svg)](https://github.com/laminas/laminas-progressbar/actions?query=workflow%3A"Continuous+Integration")
 
 laminas-progressbar is a component to create and update progress bars in different
 environments. It consists of a single backend, which outputs the progress through
@@ -23,6 +22,6 @@ Browse the documentation online at https://docs.laminas.dev/laminas-progressbar/
 
 ## Support
 
-* [Issues](https://github.com/laminas/laminas-progressbar/issues/)
-* [Chat](https://laminas.dev/chat/)
-* [Forum](https://discourse.laminas.dev/)
+- [Issues](https://github.com/laminas/laminas-progressbar/issues/)
+- [Chat](https://laminas.dev/chat/)
+- [Forum](https://discourse.laminas.dev/)

diff --git a/wcfsetup/install/files/lib/system/api/laminas/laminas-progressbar/composer.json b/wcfsetup/install/files/lib/system/api/laminas/laminas-progressbar/composer.json
index af2cd2930fc776caf2e1b7d876bd7ef911199edb..e0010664dbeca5d4386cc685e48db358ad67dc98 100644 (file)
--- a/wcfsetup/install/files/lib/system/api/laminas/laminas-progressbar/composer.json
+++ b/wcfsetup/install/files/lib/system/api/laminas/laminas-progressbar/composer.json
@@ -18,12 +18,6 @@
     "config": {
         "sort-packages": true
     },
-    "extra": {
-        "branch-alias": {
-            "dev-master": "2.7.x-dev",
-            "dev-develop": "2.8.x-dev"
-        }
-    },
     "require": {
         "php": "^5.6 || ^7.0",
         "laminas/laminas-stdlib": "^3.2.1",
@@ -60,6 +54,6 @@
         "test-coverage": "phpunit --colors=always --coverage-clover clover.xml"
     },
     "replace": {
-        "zendframework/zend-progressbar": "self.version"
+        "zendframework/zend-progressbar": "^2.7.0"
     }
 }

diff --git a/wcfsetup/install/files/lib/system/api/laminas/laminas-progressbar/src/ProgressBar.php b/wcfsetup/install/files/lib/system/api/laminas/laminas-progressbar/src/ProgressBar.php
index 660a9848be0356b762413acb1a132f57fce09b3e..6ceb6097d47620fdb8d73e4aad60cf236b72605e 100644 (file)
--- a/wcfsetup/install/files/lib/system/api/laminas/laminas-progressbar/src/ProgressBar.php
+++ b/wcfsetup/install/files/lib/system/api/laminas/laminas-progressbar/src/ProgressBar.php
@@ -48,7 +48,7 @@ class ProgressBar
      *
      * @var string
      */
-    protected $statusText = null;
+    protected $statusText = '';
 
     /**
      * Adapter for the output