From 438ccb7a34b8d969f88fc7b65a591893f8c4e031 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Sat, 20 Oct 2018 07:25:08 +0200
Subject: update to 1.25.1 drop patch merged upstream

---
 bfa211d98c6c7d1de46092bd1f5658021b508a99.patch | 123 -------------------------
 php-theseer-autoload.spec                      |  15 +--
 2 files changed, 8 insertions(+), 130 deletions(-)
 delete mode 100644 bfa211d98c6c7d1de46092bd1f5658021b508a99.patch

diff --git a/bfa211d98c6c7d1de46092bd1f5658021b508a99.patch b/bfa211d98c6c7d1de46092bd1f5658021b508a99.patch
deleted file mode 100644
index a5ec24d..0000000
--- a/bfa211d98c6c7d1de46092bd1f5658021b508a99.patch
+++ /dev/null
@@ -1,123 +0,0 @@
-From bfa211d98c6c7d1de46092bd1f5658021b508a99 Mon Sep 17 00:00:00 2001
-From: Remi Collet <remi@remirepo.net>
-Date: Sun, 14 Oct 2018 08:01:46 +0200
-Subject: [PATCH] Fix PHP 7.3 warnings => PHP Warning:  Uncaught "continue"
- targeting switch is equivalent to "break". Did you mean to use "continue 2"?
-
----
- src/Parser.php | 32 ++++++++++++++++----------------
- 1 file changed, 16 insertions(+), 16 deletions(-)
-
-diff --git a/src/Parser.php b/src/Parser.php
-index 211ff65..7625317 100644
---- a/src/Parser.php
-+++ b/src/Parser.php
-@@ -166,32 +166,32 @@ private function processClass($pos) {
-                     case T_COMMENT:
-                     case T_DOC_COMMENT:
-                     case T_WHITESPACE: {
--                        continue;
-+                        break;
-                     }
-                     case T_STRING: {
-                         $$mode .= $tok[1];
--                        continue;
-+                        break;
-                     }
-                     case T_NS_SEPARATOR: {
-                         $$mode .= '\\';
--                        continue;
-+                        break;
-                     }
-                     case T_EXTENDS: {
-                         $extendsFound = true;
-                         $mode = 'extends';
--                        continue;
-+                        break;
-                     }
-                     case T_IMPLEMENTS: {
-                         $implementsFound = true;
-                         $mode = 'implements';
--                        continue;
-+                        break;
-                     }
-                     case ',': {
-                         if ($mode == 'implements') {
-                             $implementsList[] = $this->resolveDependencyName($implements);
-                             $implements = '';
-                         }
--                        continue;
-+                        break;
-                     }
-                     default: {
-                         throw new ParserException(sprintf(
-@@ -233,11 +233,11 @@ private function processInterface($pos) {
-                     case T_NS_SEPARATOR:
-                     case T_STRING: {
-                         $$mode .= $tok[1];
--                        continue;
-+                        break;
-                     }
-                     case T_EXTENDS: {
-                         $mode = 'extends';
--                        continue;
-+                        break;
-                     }
-                     case ',': {
-                         if ($mode == 'extends') {
-@@ -389,18 +389,18 @@ private function parseUseOfTrait($stackSize, $stack) {
-                                 break;
-                             }
-                         }
--                        continue;
-+                        break;
-                     }
-                     case ';':
-                     case ',': {
-                         $this->dependencies[$this->inUnit][] = $this->resolveDependencyName($use);
-                         $use = '';
--                        continue;
-+                        break;
-                     }
-                     case T_NS_SEPARATOR:
-                     case T_STRING: {
-                         $use .= $current[1];
--                        continue;
-+                        break;
-                     }
-                 }
-             }
-@@ -421,11 +421,11 @@ private function parseUseAsImport($stack) {
-                     case T_CONST:
-                     case T_FUNCTION: {
-                         $ignore = true;
--                        continue;
-+                        break;
-                     }
-                     case '{': {
-                         $group = $use;
--                        continue;
-+                        break;
-                     }
-                     case ';':
-                     case ',': {
-@@ -447,16 +447,16 @@ private function parseUseAsImport($stack) {
-                         $use = $group;
-                         $mode = 'use';
-                         $ignore = false;
--                        continue;
-+                        break;
-                     }
-                     case T_NS_SEPARATOR:
-                     case T_STRING: {
-                         $$mode .= $current[1];
--                        continue;
-+                        break;
-                     }
-                     case T_AS: {
-                         $mode = 'alias';
--                        continue;
-+                        break;
-                     }
-                 }
-             }
diff --git a/php-theseer-autoload.spec b/php-theseer-autoload.spec
index f69d3c9..7525097 100644
--- a/php-theseer-autoload.spec
+++ b/php-theseer-autoload.spec
@@ -1,6 +1,6 @@
 # remirepo/fedora spec file for php-theseer-autoload
 #
-# Copyright (c) 2014-2017 Remi Collet
+# Copyright (c) 2014-2018 Remi Collet
 # License: CC-BY-SA
 # http://creativecommons.org/licenses/by-sa/4.0/
 #
@@ -10,7 +10,7 @@
 # For compatibility with SCL
 %undefine __brp_mangle_shebangs
 
-%global gh_commit    771674385c0dbc0995769c85cc92e221a9da1bad
+%global gh_commit    42e3aaea38bf10c2121d5c73153ba9f4862ca8ea
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_owner     theseer
 %global gh_project   Autoload
@@ -19,8 +19,8 @@
 %global pear_channel pear.netpirates.net
 
 Name:           php-theseer-autoload
-Version:        1.25.0
-Release:        3%{?dist}
+Version:        1.25.1
+Release:        1%{?dist}
 Summary:        A tool and library to generate autoload code
 
 License:        BSD
@@ -29,8 +29,6 @@ Source0:        https://github.com/%{gh_owner}/%{gh_project}/archive/%{gh_commit
 
 # Autoloader path
 Patch0:         %{gh_project}-rpm.patch
-# Upstream patch
-Patch1:         https://github.com/theseer/Autoload/commit/bfa211d98c6c7d1de46092bd1f5658021b508a99.patch
 
 BuildArch:      noarch
 BuildRequires:  php(language) >= 5.3.1
@@ -87,7 +85,6 @@ the option of creating static require lists as well as phar archives.
 %setup -q -n %{gh_project}-%{gh_commit}
 
 %patch0 -p0 -b .rpm
-%patch1 -p1
 
 : drop composer dependencies
 sed -e '\:../vendor/:d'    -i src/autoload.php
@@ -149,6 +146,10 @@ fi
 
 
 %changelog
+* Sat Oct 20 2018 Remi Collet <remi@remirepo.net> - 1.25.1-1
+- update to 1.25.1
+- drop patch merged upstream
+
 * Mon Oct 15 2018 Remi Collet <remi@remirepo.net> - 1.25.0-3
 - add upstream patch for PHP 7.3
 
-- 
cgit