From b062c588573a1455ce854670f5c2a41f2e19295c Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Wed, 9 Dec 2020 09:13:13 +0100
Subject: update to 2.17.1

---
 composer-diff.json |  4 ++--
 composer.json      |  5 -----
 makesrc.sh         | 56 +++++++++++++++++++++++++++++++-----------------------
 php-cs-fixer.spec  | 11 +++++++----
 4 files changed, 41 insertions(+), 35 deletions(-)

diff --git a/composer-diff.json b/composer-diff.json
index e08be75..2c4b3ad 100644
--- a/composer-diff.json
+++ b/composer-diff.json
@@ -18,10 +18,10 @@
         }
     ],
     "require": {
-        "php": "^5.6 || ^7.0"
+        "php": "^5.6 || ^7.0 || ^8.0"
     },
     "require-dev": {
-        "phpunit/phpunit": "^5.7.23 || ^6.4.3",
+        "phpunit/phpunit": "^5.7.23 || ^6.4.3 || ^7.0",
         "symfony/process": "^3.3"
     },
     "autoload": {
diff --git a/composer.json b/composer.json
index ccc692a..0e4ac37 100644
--- a/composer.json
+++ b/composer.json
@@ -56,11 +56,6 @@
     "config": {
         "sort-packages": true
     },
-    "extra": {
-        "branch-alias": {
-            "dev-master": "2.17-dev"
-        }
-    },
     "autoload": {
         "psr-4": {
             "PhpCsFixer\\": "src/"
diff --git a/makesrc.sh b/makesrc.sh
index d5a6236..5284c5c 100755
--- a/makesrc.sh
+++ b/makesrc.sh
@@ -7,22 +7,26 @@ VERSION=$(sed -n '/^Version:/{s/.* //;p}'           $NAME.spec)
 COMMIT=$(sed  -n '/^%global gh_commit/{s/.* //;p}'  $NAME.spec)
 SHORT=${COMMIT:0:7}
 
-echo -e "\nCreate git snapshot\nName=$NAME, Owner=$OWNER, Project=$PROJECT, Version=$VERSION, Commit=$COMMIT\n"
+if [ -f $NAME-$VERSION-$SHORT.tgz ]; then
+	echo "Skip $NAME-$VERSION-$SHORT.tgz"
+else
+	echo -e "\nCreate git snapshot\nName=$NAME, Owner=$OWNER, Project=$PROJECT, Version=$VERSION, Commit=$COMMIT\n"
 
-echo "Cloning..."
-git clone https://github.com/$OWNER/$PROJECT.git $PROJECT-$COMMIT
+	echo "Cloning..."
+	git clone https://github.com/$OWNER/$PROJECT.git $PROJECT-$COMMIT
 
-echo "Getting commit..."
-pushd $PROJECT-$COMMIT
-git checkout $COMMIT
-cp composer.json ../composer.json
-popd
+	echo "Getting commit..."
+	pushd $PROJECT-$COMMIT
+		git checkout $COMMIT || exit1
+		cp composer.json ../composer.json
+	popd
 
-echo "Archiving..."
-tar czf $NAME-$VERSION-$SHORT.tgz --exclude .git $PROJECT-$COMMIT
+	echo "Archiving..."
+	tar czf $NAME-$VERSION-$SHORT.tgz --exclude .git $PROJECT-$COMMIT
 
-echo "Cleaning..."
-rm -rf $PROJECT-$COMMIT
+	echo "Cleaning..."
+	rm -rf $PROJECT-$COMMIT
+fi
 
 PROJECT=diff
 OWNER=$(sed   -n '/^%global gh_diff_owner/{s/.* //;p}'   $NAME.spec)
@@ -30,22 +34,26 @@ VERSION=$(sed -n '/^%global gh_diff_version/{s/.* //;p}' $NAME.spec)
 COMMIT=$(sed  -n '/^%global gh_diff_commit/{s/.* //;p}'  $NAME.spec)
 SHORT=${COMMIT:0:7}
 
-echo -e "\nCreate git snapshot\nName=$NAME, Owner=$OWNER, Project=$PROJECT, Version=$VERSION, Commit=$COMMIT\n"
+if [ -f $NAME-$PROJECT-$VERSION-$SHORT.tgz ]; then
+	echo "Skip $NAME-$PROJECT-$VERSION-$SHORT.tgz"
+else
+	echo -e "\nCreate git snapshot\nName=$NAME, Owner=$OWNER, Project=$PROJECT, Version=$VERSION, Commit=$COMMIT\n"
 
-echo "Cloning..."
-git clone https://github.com/$OWNER/$PROJECT.git $PROJECT-$COMMIT
+	echo "Cloning..."
+	git clone https://github.com/$OWNER/$PROJECT.git $PROJECT-$COMMIT
 
-echo "Getting commit..."
-pushd $PROJECT-$COMMIT
-git checkout $COMMIT
-cp composer.json ../composer-diff.json
-popd
+	echo "Getting commit..."
+	pushd $PROJECT-$COMMIT
+		git checkout $COMMIT || exit 1
+		cp composer.json ../composer-diff.json
+	popd
 
-echo "Archiving..."
-tar czf $NAME-$PROJECT-$VERSION-$SHORT.tgz --exclude .git $PROJECT-$COMMIT
+	echo "Archiving..."
+	tar czf $NAME-$PROJECT-$VERSION-$SHORT.tgz --exclude .git $PROJECT-$COMMIT
 
-echo "Cleaning..."
-rm -rf $PROJECT-$COMMIT
+	echo "Cleaning..."
+	rm -rf $PROJECT-$COMMIT
+fi
 
 echo "Done."
 
diff --git a/php-cs-fixer.spec b/php-cs-fixer.spec
index 072ab86..0597f93 100644
--- a/php-cs-fixer.spec
+++ b/php-cs-fixer.spec
@@ -10,7 +10,7 @@
 # For compatibility with SCL
 %undefine __brp_mangle_shebangs
 
-%global gh_commit    5274ce3d3200a2b374baa42143cb9dfcdcc2fa52
+%global gh_commit    5198b7308ed63f26799387fd7f3901c3db6bd7fd
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 #global gh_date      20150717
 %global gh_owner     FriendsOfPHP
@@ -21,12 +21,12 @@
 # Bundled this fork which is not designed for use outside of php-cs-fixer
 # https://github.com/PHP-CS-Fixer/diff/releases
 %global gh_diff_owner   PHP-CS-Fixer
-%global gh_diff_version 1.3.0
-%global gh_diff_commit  78bb099e9c16361126c86ce82ec4405ebab8e756
+%global gh_diff_version 1.3.1
+%global gh_diff_commit  dbd31aeb251639ac0b9e7e29405c1441907f5759
 %global gh_diff_short   %(c=%{gh_diff_commit}; echo ${c:0:7})
 
 Name:           php-cs-fixer
-Version:        2.17.0
+Version:        2.17.1
 Release:        1%{?gh_date:.%{gh_date}git%{gh_short}}%{?dist}
 Summary:        A tool to automatically fix PHP code style
 
@@ -334,6 +334,9 @@ exit $ret
 
 
 %changelog
+* Wed Dec  9 2020 Remi Collet <remi@remirepo.net> - 2.17.1-1
+- update to 2.17.1
+
 * Tue Dec  8 2020 Remi Collet <remi@remirepo.net> - 2.17.0-1
 - update to 2.17.0
 
-- 
cgit