New Upstream Snapshot - php-zeta-console-tools
Ready changes
Summary
Merged new upstream version: 1.7.3+git20220914.1.32c5e08 (was: 1.7.3).
Diff
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
deleted file mode 100644
index 1fbf035..0000000
--- a/.github/workflows/ci.yml
+++ /dev/null
@@ -1,55 +0,0 @@
-name: CI
-
-on:
- # Run on all pushes and on all pull requests.
- push:
- pull_request:
- # Allow manually triggering the workflow.
- workflow_dispatch:
-
-jobs:
- test:
- runs-on: ubuntu-latest
-
- strategy:
- fail-fast: false
- # Keys:
- # - experimental: Whether the build is "allowed to fail".
- matrix:
- php: ['7.2', '7.3', '7.4', '8.0']
- experimental: [false]
-
- include:
- - php: '8.1'
- experimental: true
-
- name: "PHP: ${{ matrix.php }}"
-
- continue-on-error: ${{ matrix.experimental }}
-
- steps:
- - name: Checkout code
- uses: actions/checkout@v2
-
- - name: Install PHP
- uses: shivammathur/setup-php@v2
- with:
- php-version: ${{ matrix.php }}
- ini-values: error_reporting=-1, display_errors=On, log_errors_max_len=0
- coverage: none
- tools: none
-
- # Install dependencies and handle caching in one go.
- # @link https://github.com/marketplace/actions/install-composer-dependencies
- - name: "Install Composer dependencies (PHP < 8.1)"
- if: ${{ matrix.php < '8.1' }}
- uses: "ramsey/composer-install@v1"
-
- - name: "Install Composer dependencies (PHP 8.1)"
- if: ${{ matrix.php >= '8.1' }}
- uses: "ramsey/composer-install@v1"
- with:
- composer-options: --ignore-platform-reqs
-
- - name: Run unit tests
- run: vendor/bin/phpunit
diff --git a/.gitignore b/.gitignore
deleted file mode 100644
index 5adea75..0000000
--- a/.gitignore
+++ /dev/null
@@ -1,6 +0,0 @@
-vendor
-run-tests-tmp
-extract
-composer.lock
-composer.phar
-.phpunit.result.cache
diff --git a/README.rst b/README.rst
new file mode 100644
index 0000000..154b9e1
--- /dev/null
+++ b/README.rst
@@ -0,0 +1,26 @@
+Zeta Components - ConsoleTools
+==============================
+
+Introduction
+------------
+
+The ConsoleTools component provides several useful tools to build applications
+that run on a computer console (sometimes also called shell or command line).
+For example, eZ Publish includes several shell scripts that perform tasks like
+clearing caches.
+
+Documentation
+-------------
+
+`eZ Components - ConsoleTools Online documentation
+<http://zetacomponents.org/documentation/trunk/ConsoleTools/tutorial.html>`_
+
+Changelog
+---------
+
+* See the `ChangeLog File <ChangeLog>`_.
+
+License
+-------
+
+This solution is licensed under the `MIT <LICENSE.txt>`_.
diff --git a/composer.json b/composer.json
index 2960440..4fca57d 100644
--- a/composer.json
+++ b/composer.json
@@ -50,7 +50,7 @@
"zetacomponents/base": "~1.8"
},
"require-dev": {
- "phpunit/phpunit": "~8.0",
+ "phpunit/phpunit": "~9.0",
"zetacomponents/unit-test": "*"
}
}
diff --git a/debian/changelog b/debian/changelog
index 2e8ee55..8d44269 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+php-zeta-console-tools (1.7.3+git20220914.1.32c5e08-1) UNRELEASED; urgency=low
+
+ * New upstream snapshot.
+
+ -- Debian Janitor <janitor@jelmer.uk> Wed, 08 Feb 2023 20:44:19 -0000
+
php-zeta-console-tools (1.7.3-1) unstable; urgency=medium
[ Derick Rethans ]
diff --git a/debian/patches/0001-Adapt-to-recent-version-of-PHPUnit-9.patch b/debian/patches/0001-Adapt-to-recent-version-of-PHPUnit-9.patch
index d82647a..eaee37c 100644
--- a/debian/patches/0001-Adapt-to-recent-version-of-PHPUnit-9.patch
+++ b/debian/patches/0001-Adapt-to-recent-version-of-PHPUnit-9.patch
@@ -9,11 +9,11 @@ Subject: Adapt to recent version of PHPUnit (9)
tests/statusbar_test.php | 12 +++++-
4 files changed, 86 insertions(+), 57 deletions(-)
-diff --git a/tests/arguments_test.php b/tests/arguments_test.php
-index a051239..0ff6fa6 100644
---- a/tests/arguments_test.php
-+++ b/tests/arguments_test.php
-@@ -218,18 +218,21 @@ class ezcConsoleArgumentsTest extends ezcTestCase
+Index: php-zeta-console-tools.git/tests/arguments_test.php
+===================================================================
+--- php-zeta-console-tools.git.orig/tests/arguments_test.php
++++ php-zeta-console-tools.git/tests/arguments_test.php
+@@ -218,18 +218,21 @@ class ezcConsoleArgumentsTest extends ez
unset( $args[0], $args[2], $args[4], $args[5], $args[6] );
@@ -47,11 +47,11 @@ index a051239..0ff6fa6 100644
}
public function testOffsetUnsetFailure()
-diff --git a/tests/option_test.php b/tests/option_test.php
-index 3e934f1..8c09d18 100644
---- a/tests/option_test.php
-+++ b/tests/option_test.php
-@@ -121,11 +121,13 @@ class ezcConsoleOptionTest extends ezcTestCase
+Index: php-zeta-console-tools.git/tests/option_test.php
+===================================================================
+--- php-zeta-console-tools.git.orig/tests/option_test.php
++++ php-zeta-console-tools.git/tests/option_test.php
+@@ -121,11 +121,13 @@ class ezcConsoleOptionTest extends ezcTe
$option_1->addDependency( $rule );
$option_1->addDependency( $rule );
@@ -70,7 +70,7 @@ index 3e934f1..8c09d18 100644
}
public function testRemoveDependency()
-@@ -146,11 +148,13 @@ class ezcConsoleOptionTest extends ezcTestCase
+@@ -146,11 +148,13 @@ class ezcConsoleOptionTest extends ezcTe
$option_1->addDependency( $rule );
$option_1->removeDependency( $rule );
@@ -89,7 +89,7 @@ index 3e934f1..8c09d18 100644
}
// Bug #9052: Exception because of invalid property in ezcConsoleOption
-@@ -177,11 +181,13 @@ class ezcConsoleOptionTest extends ezcTestCase
+@@ -177,11 +181,13 @@ class ezcConsoleOptionTest extends ezcTe
$option_1->addDependency( $rule_2 );
$option_1->removeAllDependencies( $option_2 );
@@ -108,7 +108,7 @@ index 3e934f1..8c09d18 100644
}
// Bug #9052: Exception because of invalid property in ezcConsoleOption
-@@ -245,11 +251,13 @@ class ezcConsoleOptionTest extends ezcTestCase
+@@ -245,11 +251,13 @@ class ezcConsoleOptionTest extends ezcTe
$option_1->addDependency( $rule );
$option_1->resetDependencies();
@@ -127,7 +127,7 @@ index 3e934f1..8c09d18 100644
}
public function testAddExclusion()
-@@ -270,11 +278,13 @@ class ezcConsoleOptionTest extends ezcTestCase
+@@ -270,11 +278,13 @@ class ezcConsoleOptionTest extends ezcTe
$option_1->addExclusion( $rule );
$option_1->addExclusion( $rule );
@@ -146,7 +146,7 @@ index 3e934f1..8c09d18 100644
}
public function testRemoveExclusion()
-@@ -295,11 +305,13 @@ class ezcConsoleOptionTest extends ezcTestCase
+@@ -295,11 +305,13 @@ class ezcConsoleOptionTest extends ezcTe
$option_1->addExclusion( $rule );
$option_1->removeExclusion( $rule );
@@ -165,7 +165,7 @@ index 3e934f1..8c09d18 100644
}
// Bug #9052: Exception because of invalid property in ezcConsoleOption
-@@ -326,11 +338,13 @@ class ezcConsoleOptionTest extends ezcTestCase
+@@ -326,11 +338,13 @@ class ezcConsoleOptionTest extends ezcTe
$option_1->addExclusion( $rule_2 );
$option_1->removeAllExclusions( $option_2 );
@@ -184,7 +184,7 @@ index 3e934f1..8c09d18 100644
}
// Bug #9052: Exception because of invalid property in ezcConsoleOption
-@@ -394,11 +408,13 @@ class ezcConsoleOptionTest extends ezcTestCase
+@@ -394,11 +408,13 @@ class ezcConsoleOptionTest extends ezcTe
$option_1->addExclusion( $rule );
$option_1->resetExclusions();
@@ -203,11 +203,11 @@ index 3e934f1..8c09d18 100644
}
public function testPropertyGetAccessSuccess()
-diff --git a/tests/output_formats_test.php b/tests/output_formats_test.php
-index fed9527..95bc174 100644
---- a/tests/output_formats_test.php
-+++ b/tests/output_formats_test.php
-@@ -112,9 +112,11 @@ class ezcConsoleOutputFormatsTest extends ezcTestCase
+Index: php-zeta-console-tools.git/tests/output_formats_test.php
+===================================================================
+--- php-zeta-console-tools.git.orig/tests/output_formats_test.php
++++ php-zeta-console-tools.git/tests/output_formats_test.php
+@@ -112,9 +112,11 @@ class ezcConsoleOutputFormatsTest extend
public function testIterator()
{
$formatsObj = new ezcConsoleOutputFormats();
@@ -222,11 +222,11 @@ index fed9527..95bc174 100644
reset( $formatsArr );
// First run
-diff --git a/tests/statusbar_test.php b/tests/statusbar_test.php
-index 5981e0c..a7d1856 100644
---- a/tests/statusbar_test.php
-+++ b/tests/statusbar_test.php
-@@ -280,12 +280,20 @@ class ezcConsoleStatusbarTest extends ezcTestCase
+Index: php-zeta-console-tools.git/tests/statusbar_test.php
+===================================================================
+--- php-zeta-console-tools.git.orig/tests/statusbar_test.php
++++ php-zeta-console-tools.git/tests/statusbar_test.php
+@@ -280,12 +280,20 @@ class ezcConsoleStatusbarTest extends ez
}
ob_end_clean();
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index a1cfdd1..e9d2575 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -1,14 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
-<phpunit bootstrap="./tests/bootstrap.php" colors="true" beStrictAboutTestsThatDoNotTestAnything="false">
- <testsuites>
- <testsuite name="Zeta Components ConsoleTools">
- <directory suffix="_test.php">./tests</directory>
- </testsuite>
- </testsuites>
-
- <filter>
- <whitelist>
- <directory>./src</directory>
- </whitelist>
- </filter>
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" bootstrap="./tests/bootstrap.php" colors="true" beStrictAboutTestsThatDoNotTestAnything="false" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd">
+ <coverage>
+ <include>
+ <directory>./src</directory>
+ </include>
+ </coverage>
+ <testsuites>
+ <testsuite name="Zeta Components ConsoleTools">
+ <directory suffix="_test.php">./tests</directory>
+ </testsuite>
+ </testsuites>
</phpunit>
diff --git a/tests/data/posix/ezcConsoleQuestionDialogTest__testDialog5.php b/tests/data/posix/ezcConsoleQuestionDialogTest__testDialog5.php
index 8d5e186..d482698 100644
--- a/tests/data/posix/ezcConsoleQuestionDialogTest__testDialog5.php
+++ b/tests/data/posix/ezcConsoleQuestionDialogTest__testDialog5.php
@@ -9,9 +9,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -42,7 +42,7 @@ try
}
catch ( ezcConsoleDialogAbortException $e )
{
- echo "User manually aborted\ņ";
+ echo "User manually aborted\n";
}
?>
diff --git a/tests/input_test.php b/tests/input_test.php
index c694b82..86b1203 100644
--- a/tests/input_test.php
+++ b/tests/input_test.php
@@ -189,6 +189,8 @@ class ezcConsoleInputTest extends ezcTestCase
),
);
+ private $input = null;
+
public static function suite()
{
return new PHPUnit\Framework\TestSuite( "ezcConsoleInputTest" );
diff --git a/tests/table_test.php b/tests/table_test.php
index c862ee5..a4697a2 100644
--- a/tests/table_test.php
+++ b/tests/table_test.php
@@ -68,6 +68,8 @@ class ezcConsoleTableTest extends ezcTestCase
array( 'Nön UTF-8 cölümn 1', 'Nön UTF-8 cölümn 2', 'Löng löng löng löng löng löng löng nön UTF-8 cölümn' ),
);
+ private $output = null;
+
public static function suite()
{
return new PHPUnit\Framework\TestSuite( "ezcConsoleTableTest" );