update to 5.0.0

raise dependency on PHP 7.1
switch to Symfony 4
raise dependency on phpspec/prophecy 1.7
undefine __brp_mangle_shebangs

2 files changed, 45 insertions, 36 deletions

diff --git a/composer.json b/composer.json
index 43b1be8..fa536f6 100644
--- a/composer.json
+++ b/composer.json
@@ -22,23 +22,23 @@
     ],
 
     "require": {
-        "php":                      "^7.0,<7.3",
-        "phpspec/prophecy":         "^1.5",
+        "php":                      "^7.1, <7.3",
+        "phpspec/prophecy":         "^1.7",
         "phpspec/php-diff":         "^1.0.0",
         "sebastian/exporter":       "^1.0 || ^2.0 || ^3.0",
-        "symfony/console":          "^3.2 || ^4.0",
-        "symfony/event-dispatcher": "^3.2 || ^4.0",
-        "symfony/process":          "^3.2 || ^4.0",
-        "symfony/finder":           "^3.2 || ^4.0",
-        "symfony/yaml":             "^3.2 || ^4.0",
+        "symfony/console":          "^3.4 || ^4.0",
+        "symfony/event-dispatcher": "^3.4 || ^4.0",
+        "symfony/process":          "^3.4 || ^4.0",
+        "symfony/finder":           "^3.4 || ^4.0",
+        "symfony/yaml":             "^3.4 || ^4.0",
         "doctrine/instantiator":    "^1.0.5",
         "ext-tokenizer":            "*"
     },
 
     "require-dev": {
         "behat/behat":           "^3.3",
-        "symfony/filesystem":    "^3.2 || ^4.0",
-        "phpunit/phpunit":       "^5.7|^6.0"
+        "symfony/filesystem":    "^3.4 || ^4.0",
+        "phpunit/phpunit":       "^5.7 || ^6.0"
     },
 
     "suggest": {
@@ -61,7 +61,7 @@
 
     "extra": {
         "branch-alias": {
-            "dev-master": "4.3.x-dev"
+            "dev-master": "5.0.x-dev"
         }
     }
 }
diff --git a/php-phpspec.spec b/php-phpspec.spec
index 55f5e2e..68dcd37 100644
--- a/php-phpspec.spec
+++ b/php-phpspec.spec
@@ -6,7 +6,11 @@
 #
 # Please, preserve the changelog entries
 #
-%global gh_commit    4474f1cb4cf9873996fc07fac6533ab9298eb6fd
+
+# For compatibility with SCL
+%undefine __brp_mangle_shebangs
+
+%global gh_commit    33fa9932c22b64f9b05e9c4ef5d1acbdd28e8912
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_owner     phpspec
 %global gh_project   phpspec
@@ -14,12 +18,12 @@
 
 # Only allow a single Symfony version
 # to ensure components consistency
-%global symfony_ns  Symfony3
-%global symfony_min 3.2
-%global symfony_max 4
+%global symfony_ns  Symfony4
+%global symfony_min 4.0
+%global symfony_max 5
 
 Name:           php-phpspec
-Version:        4.3.1
+Version:        5.0.0
 Release:        1%{?dist}
 Summary:        Specification-oriented BDD framework for PHP
 
@@ -34,38 +38,37 @@ Source1:        %{gh_project}-autoload.php
 Patch0:         %{gh_project}-4-rpm.patch
 
 BuildArch:      noarch
-BuildRequires:  php(language) >= 7.0
+BuildRequires:  php(language) >= 7.1
 # remirepo:1
 %if 0%{?fedora} >= 27 || 0%{?rhel} >= 8
-BuildRequires: (php-composer(phpspec/prophecy)         >= 1.5   with php-composer(phpspec/prophecy)         <  2)
+BuildRequires: (php-composer(phpspec/prophecy)         >= 1.7   with php-composer(phpspec/prophecy)         <  2)
 BuildRequires: (php-composer(phpspec/php-diff)         >= 1.0.0 with php-composer(phpspec/php-diff)         <  2)
 BuildRequires: (php-composer(sebastian/exporter)       >= 3     with php-composer(sebastian/exporter)       <  4)
 BuildRequires: (php-composer(doctrine/instantiator)    >= 1.0.5 with php-composer(doctrine/instantiator)    <  2)
 # remirepo:6
 %else
-BuildRequires:  php-phpspec-prophecy         >= 1.5
+BuildRequires:  php-phpspec-prophecy         >= 1.7
 BuildRequires:  php-phpspec-php-diff         >= 1.0.0
 BuildRequires:  php-sebastian-exporter3      >= 3
 BuildRequires:  php-doctrine-instantiator    >= 1.0.5
 %endif
-BuildRequires:  php-symfony3-console                   >= %{symfony_min}
-BuildRequires:  php-symfony3-event-dispatcher          >= %{symfony_min}
-BuildRequires:  php-symfony3-finder                    >= %{symfony_min}
-BuildRequires:  php-symfony3-process                   >= %{symfony_min}
-BuildRequires:  php-symfony3-yaml                      >= %{symfony_min}
+BuildRequires:  php-symfony4-console                   >= %{symfony_min}
+BuildRequires:  php-symfony4-event-dispatcher          >= %{symfony_min}
+BuildRequires:  php-symfony4-finder                    >= %{symfony_min}
+BuildRequires:  php-symfony4-process                   >= %{symfony_min}
+BuildRequires:  php-symfony4-yaml                      >= %{symfony_min}
 # From composer.json, require-dev
 #        "behat/behat":           "^3.3",
-#        "symfony/filesystem":    "^3.2 || ^4.0",
-#        "phpunit/phpunit":       "^5.7|^6.0",
-BuildRequires:  php-composer(symfony/filesystem)       <  %{symfony_max}
-BuildRequires:  php-composer(symfony/filesystem)       >= %{symfony_min}
+#        "symfony/filesystem":    "^3.4 || ^4.0",
+#        "phpunit/phpunit":       "^5.7 || ^6.0",
+BuildRequires:  php-symfony4-filesystem                >= %{symfony_min}
 BuildRequires:  phpunit6
 # Autoloader
 BuildRequires:  php-composer(fedora/autoloader) >= 1
 
 # From composer.json, require
 #        "php":                      "^7.0,<7.3",
-#        "phpspec/prophecy":         "^1.5",
+#        "phpspec/prophecy":         "^1.7",
 #        "phpspec/php-diff":         "^1.0.0",
 #        "sebastian/exporter":       "^1.0 || ^2.0 || ^3.0",
 #        "symfony/console":          "^3.2 || ^4.0",
@@ -76,25 +79,24 @@ BuildRequires:  php-composer(fedora/autoloader) >= 1
 #        "doctrine/instantiator":    "^1.0.5"
 #        "ext-tokenizer":            "*"
 
-Requires:       php(language) >= 7.0
+Requires:       php(language) >= 7.1
 # remirepo:1
 %if 0%{?fedora} >= 27 || 0%{?rhel} >= 8
-Requires:      (php-composer(phpspec/prophecy)         >= 1.5   with php-composer(phpspec/prophecy)         <  2)
+Requires:      (php-composer(phpspec/prophecy)         >= 1.7   with php-composer(phpspec/prophecy)         <  2)
 Requires:      (php-composer(phpspec/php-diff)         >= 1.0.0 with php-composer(phpspec/php-diff)         <  2)
 Requires:      (php-composer(sebastian/exporter)       >= 3     with php-composer(sebastian/exporter)       <  4)
 Requires:      (php-composer(doctrine/instantiator)    >= 1.0.5 with php-composer(doctrine/instantiator)    <  2)
 # remirepo:6
 %else
-Requires:       php-phpspec-prophecy         >= 1.5
+Requires:       php-phpspec-prophecy         >= 1.7
 Requires:       php-phpspec-php-diff         >= 1.0.0
 Requires:       php-sebastian-exporter3      >= 3
 Requires:       php-doctrine-instantiator    >= 1.0.5
 %endif
-Requires:       php-symfony3-console                   >= %{symfony_min}
-Requires:       php-symfony3-event-dispatcher          >= %{symfony_min}
-Requires:       php-symfony3-finder                    >= %{symfony_min}
-Requires:       php-symfony3-process                   >= %{symfony_min}
-Requires:       php-symfony3-yaml                      >= %{symfony_min}
+Requires:       php-symfony4-console                   >= %{symfony_min}
+Requires:       php-symfony4-event-dispatcher          >= %{symfony_min}
+Requires:       php-symfony4-finder                    >= %{symfony_min}
+Requires:       php-symfony4-process                   >= %{symfony_min}
 Requires:       php-tokenizer
 # Autoloader
 Requires:       php-composer(fedora/autoloader) >= 1
@@ -175,6 +177,13 @@ done
 
 
 %changelog
+* Mon Jul 16 2018 Remi Collet <remi@remirepo.net> - 5.0.0-1
+- update to 5.0.0
+- raise dependency on PHP 7.1
+- switch to Symfony 4
+- raise dependency on phpspec/prophecy 1.7
+- undefine __brp_mangle_shebangs
+
 * Tue Jul  3 2018 Remi Collet <remi@remirepo.net> - 4.3.1-1
 - update to 4.3.1
 - use range dependencies on F27+