diff --git a/.gitignore b/.gitignore index 2a1c284..833a091 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ /php-nette-utils-2.3.7-6f1ed73.tgz /php-nette-utils-2.3.8-34ca4cd.tgz /php-nette-utils-2.3.9-f6586f8.tgz +/php-nette-utils-2.3.10-66ceba1.tgz diff --git a/php-nette-utils-pr91.patch b/php-nette-utils-pr91.patch deleted file mode 100644 index caea7a8..0000000 --- a/php-nette-utils-pr91.patch +++ /dev/null @@ -1,51 +0,0 @@ -From cddddd0fa49f1b0eeb19be18389711222b1a0aee Mon Sep 17 00:00:00 2001 -From: Remi Collet -Date: Mon, 9 Nov 2015 16:52:13 +0100 -Subject: [PATCH] allow to skip online tests - ---- - tests/Utils/FileSystem.phpt | 24 ++++++++++++++++++------ - 1 file changed, 18 insertions(+), 6 deletions(-) - -diff --git a/tests/Utils/FileSystem.phpt b/tests/Utils/FileSystem.phpt -index 68871f2..2a0c96c 100644 ---- a/tests/Utils/FileSystem.phpt -+++ b/tests/Utils/FileSystem.phpt -@@ -41,8 +41,13 @@ test(function () { // copy - FileSystem::copy(TEMP_DIR . '/3/file', TEMP_DIR . '/3/x/file'); - Assert::same('Hello', file_get_contents(TEMP_DIR . '/3/x/file')); - -- FileSystem::copy('http://example.com', TEMP_DIR . '/3/x/y/file'); -- Assert::true(is_file(TEMP_DIR . '/3/x/y/file')); -+ if (getenv('SKIP_ONLINE_TESTS') ?: false) { -+ FileSystem::copy(__FILE__, TEMP_DIR . '/3/x/y/file'); -+ Assert::true(is_file(TEMP_DIR . '/3/x/y/file')); -+ } else { -+ FileSystem::copy('http://example.com', TEMP_DIR . '/3/x/y/file'); -+ Assert::true(is_file(TEMP_DIR . '/3/x/y/file')); -+ } - - FileSystem::write(TEMP_DIR . '/5/newfile', 'World'); - -@@ -51,10 +56,17 @@ test(function () { // copy - }, 'Nette\InvalidStateException', "File or directory '%a%' already exists."); - Assert::same('Hello', file_get_contents(TEMP_DIR . '/3/x/file')); - -- Assert::exception(function () { -- FileSystem::copy('http://example.com', TEMP_DIR . '/3/x/file', FALSE); -- }, 'Nette\InvalidStateException', "File or directory '%a%' already exists."); -- Assert::same('Hello', file_get_contents(TEMP_DIR . '/3/x/file')); -+ if (getenv('SKIP_ONLINE_TESTS') ?: false) { -+ Assert::exception(function () { -+ FileSystem::copy(__FILE__, TEMP_DIR . '/3/x/file', FALSE); -+ }, 'Nette\InvalidStateException', "File or directory '%a%' already exists."); -+ Assert::same('Hello', file_get_contents(TEMP_DIR . '/3/x/file')); -+ } else { -+ Assert::exception(function () { -+ FileSystem::copy('http://example.com', TEMP_DIR . '/3/x/file', FALSE); -+ }, 'Nette\InvalidStateException', "File or directory '%a%' already exists."); -+ Assert::same('Hello', file_get_contents(TEMP_DIR . '/3/x/file')); -+ } - - FileSystem::copy(TEMP_DIR . '/5/newfile', TEMP_DIR . '/3/x/file'); - Assert::same('World', file_get_contents(TEMP_DIR . '/3/x/file')); diff --git a/php-nette-utils.spec b/php-nette-utils.spec index 23e01c4..1078324 100644 --- a/php-nette-utils.spec +++ b/php-nette-utils.spec @@ -6,7 +6,7 @@ # # Please, preserve the changelog entries # -%global gh_commit f6586f827292bd35c8593df943437f2247ba5337 +%global gh_commit 66ceba196e4535ca3bf8f835db50d7e02339fdb0 #global gh_date 20150728 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner nette @@ -16,7 +16,7 @@ %global with_tests 0%{!?_without_tests:1} Name: php-nette-utils -Version: 2.3.9 +Version: 2.3.10 %global specrel 1 Release: %{?gh_date:0.%{specrel}.%{?prever}%{!?prever:%{gh_date}git%{gh_short}}}%{!?gh_date:%{specrel}}%{?dist} Summary: Nette Utility Classes @@ -28,10 +28,6 @@ Source0: %{name}-%{version}-%{gh_short}.tgz # pull a git snapshot to get test sutie Source1: makesrc.sh -# https://github.com/nette/utils/pull/91 -# And https://github.com/nette/utils/issues/112 -Patch0: %{name}-pr91.patch - BuildArch: noarch BuildRequires: php-composer(theseer/autoload) %if %{with_tests} @@ -96,8 +92,6 @@ To use this library, you just have to add, in your project: %prep %setup -q -n %{gh_project}-%{gh_commit} -%patch0 -p1 - %build : Generate a classmap autoloader @@ -132,12 +126,10 @@ require_once '%{buildroot}%{php_home}/%{ns_vendor}/Utils/autoload.php'; EOF : Run test suite in sources tree -SKIP_ONLINE_TESTS=1 \ nette-tester --colors 0 -p php -c ./php.ini tests -s if which php70; then cat /etc/opt/remi/php70/php.ini /etc/opt/remi/php70/php.d/*ini >php.ini - SKIP_ONLINE_TESTS=1 \ php70 %{_bindir}/nette-tester --colors 0 -p php70 -c ./php.ini tests -s fi %else @@ -156,6 +148,9 @@ fi %changelog +* Mon Jun 20 2016 Remi Collet - 2.3.10-1 +- update to 2.3.10 + * Thu Jun 2 2016 Remi Collet - 2.3.9-1 - update to 2.3.9 diff --git a/sources b/sources index 8770ab7..7bd0e6e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -30dad10d8bf2935e0ea1950c4738cf3b php-nette-utils-2.3.9-f6586f8.tgz +59b8f35d55fb620e06103b21f569d3ee php-nette-utils-2.3.10-66ceba1.tgz