From 31c58fb2b6fc241857ddb66ae2b6b0384fe8b440 Mon Sep 17 00:00:00 2001
From: Shawn Iwinski <shawn@iwin.ski>
Date: Jun 16 2019 20:02:38 +0000
Subject: Update to 4.0.0 (RHBZ #1653281)


---

diff --git a/.gitignore b/.gitignore
index 1980c49..8ba2527 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 /php-pda-pheanstalk-3.1.0-430e77c551479aad0c6ada0450ee844cf656a18b.tar.gz
 /php-pda-pheanstalk-3.2.1-57b6e76f1b06ca798e739a8dee92c2dac04fd170.tar.gz
+/php-pda-pheanstalk-4.0.0-328708b2cb843c214579a9ac3d1730c074038d6a.tar.gz
diff --git a/composer.json b/composer.json
index d756480..3b93393 100644
--- a/composer.json
+++ b/composer.json
@@ -11,22 +11,33 @@
             "email": "paul@annesley.cc",
             "homepage": "http://paul.annesley.cc/",
             "role": "Developer"
+        },
+        {
+            "name": "Sam Mousa",
+            "email": "sam@mousa.nl",
+            "role": "Maintainer"
         }
     ],
     "require": {
-        "php": ">=5.3.0"
+        "php": ">=7.1.0",
+        "ext-mbstring": "*"
     },
     "require-dev": {
-        "phpunit/phpunit": "~4.0"
+        "phpunit/phpunit": "^7",
+        "vimeo/psalm": "^2.0",
+        "phpdocumentor/phpdocumentor": "^2"
     },
     "autoload": {
         "psr-4": {
             "Pheanstalk\\": "src/"
         }
     },
-    "extra": {
-        "branch-alias": {
-            "dev-master": "3.1-dev"
-        }
+    "scripts": {
+        "phpunit": "docker-compose run --rm phpunit",
+        "psalm": "@php vendor/bin/psalm --show-info=false src",
+        "test": [
+            "@composer install",
+            "@phpunit"
+        ]
     }
 }
diff --git a/php-pda-pheanstalk.spec b/php-pda-pheanstalk.spec
index c8bed21..cf9b05c 100644
--- a/php-pda-pheanstalk.spec
+++ b/php-pda-pheanstalk.spec
@@ -11,14 +11,14 @@
 
 %global github_owner     pda
 %global github_name      pheanstalk
-%global github_version   3.2.1
-%global github_commit    57b6e76f1b06ca798e739a8dee92c2dac04fd170
+%global github_version   4.0.0
+%global github_commit    328708b2cb843c214579a9ac3d1730c074038d6a
 
 %global composer_vendor  pda
 %global composer_project pheanstalk
 
-# "php": ">=5.3.0"
-%global php_min_ver 5.3.0
+# "php": ">=7.1.0"
+%global php_min_ver 7.1.0
 
 # Build using "--without tests" to disable tests
 %global with_tests 0%{!?_without_tests:1}
@@ -44,10 +44,10 @@ BuildArch:     noarch
 ## composer.json
 BuildRequires: php(language) >= %{php_min_ver}
 BuildRequires: php-composer(phpunit/phpunit)
-## phpcompatinfo (computed from version 3.2.1)
-BuildRequires: php-ctype
 BuildRequires: php-mbstring
+## phpcompatinfo (computed from version 4.0.0)
 BuildRequires: php-pcre
+BuildRequires: php-sockets
 BuildRequires: php-spl
 ## Autoloader
 BuildRequires: php-composer(fedora/autoloader)
@@ -55,10 +55,10 @@ BuildRequires: php-composer(fedora/autoloader)
 
 # composer.json
 Requires:      php(language) >= %{php_min_ver}
-# phpcompatinfo (computed from version 3.2.1)
-Requires:      php-ctype
 Requires:      php-mbstring
+# phpcompatinfo (computed from version 4.0.0)
 Requires:      php-pcre
+Requires:      php-sockets
 Requires:      php-spl
 # Autoloader
 Requires:      php-composer(fedora/autoloader)
@@ -116,20 +116,13 @@ cp -rp src %{buildroot}%{phpdir}/Pheanstalk
 rm -f \
     tests/Pheanstalk/BugfixConnectionTest.php \
     tests/Pheanstalk/ConnectionTest.php \
-    tests/Pheanstalk/FacadeConnectionTest.php
-
-%if 0%{?el6}
-: Skip tests requiring newer PHPUnit
-sed \
-    -e 's/function testGetLine/function SKIP_testGetLine/' \
-    -e 's/function testGetLineException/function SKIP_testGetLineException/' \
-    -i tests/Pheanstalk/NativeSocketTest.php
-%endif
+    tests/Pheanstalk/PheanstalkTest.php \
+    tests/Pheanstalk/SocketFactoryTest.php
 
 : Upstream tests
 RETURN_CODE=0
 PHPUNIT=$(which phpunit)
-for PHP_EXEC in php %{?rhel:php54 php55} php56 php70 php71 php72 php73 php74; do
+for PHP_EXEC in php php72 php73 php74; do
     if [ "php" == "$PHP_EXEC" ] || which $PHP_EXEC; then
         $PHP_EXEC $PHPUNIT --verbose \
             --bootstrap %{buildroot}%{phpdir}/Pheanstalk/autoload.php \
@@ -151,6 +144,9 @@ exit $RETURN_CODE
 
 
 %changelog
+* Sun Jun 16 2019 Shawn Iwinski <shawn@iwin.ski> - 4.0.0-1
+- Update to 4.0.0 (RHBZ #1653281)
+
 * Mon Jun 03 2019 Shawn Iwinski <shawn@iwin.ski> - 3.2.1-1
 - Update to 3.2.1
 
diff --git a/sources b/sources
index 8e1ec53..76e603f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (php-pda-pheanstalk-3.2.1-57b6e76f1b06ca798e739a8dee92c2dac04fd170.tar.gz) = 51de79d8b72be70f73251c6a682772b9f6602ae5f92b21929791d6076a5d9adfbcee3dd482d19cd2efa1d5a7a843c2a46ce7bb878bf7f3bca29664719ba7709c
+SHA512 (php-pda-pheanstalk-4.0.0-328708b2cb843c214579a9ac3d1730c074038d6a.tar.gz) = 80a78d20bec1d37acbb42c13269d4b17841bd192bd53f001736eb66434699a0c2aebb0736742729b77ae79fc3e612a0985418aa1f54e386a0211325f43f1a982