From a11a122c7e7527754e4d04c57a04bd3ae8170b74 Mon Sep 17 00:00:00 2001 From: Jamie Isaacs Date: Wed, 11 Dec 2019 14:55:29 -0800 Subject: [PATCH] Upgraded to PHP 7.1 for a 1.0.0 release --- .gitignore | 5 ++--- .idea/.name | 1 - .idea/encodings.xml | 5 ----- .idea/inspectionProfiles/Project_Default.xml | 10 ---------- .idea/inspectionProfiles/profiles_settings.xml | 7 ------- .idea/misc.xml | 5 ----- .idea/modules.xml | 9 --------- .idea/php.xml | 9 --------- .idea/scopes/scope_settings.xml | 5 ----- .idea/shipping.iml | 12 ------------ .idea/vcs.xml | 7 ------- .travis.yml | 2 +- composer.json | 4 ++-- 13 files changed, 5 insertions(+), 76 deletions(-) delete mode 100644 .idea/.name delete mode 100644 .idea/encodings.xml delete mode 100644 .idea/inspectionProfiles/Project_Default.xml delete mode 100644 .idea/inspectionProfiles/profiles_settings.xml delete mode 100644 .idea/misc.xml delete mode 100644 .idea/modules.xml delete mode 100644 .idea/php.xml delete mode 100644 .idea/scopes/scope_settings.xml delete mode 100644 .idea/shipping.iml delete mode 100644 .idea/vcs.xml diff --git a/.gitignore b/.gitignore index 32605eb..8c1d8ea 100644 --- a/.gitignore +++ b/.gitignore @@ -1,8 +1,7 @@ vendor composer.lock coverage_report -.idea/*.iws -.idea/workspace.xml -.idea/tasks.xml +.idea/* +!.idea/runConfigurations/ .DS_Store live_phpunit.sh diff --git a/.idea/.name b/.idea/.name deleted file mode 100644 index 12940c6..0000000 --- a/.idea/.name +++ /dev/null @@ -1 +0,0 @@ -shipping \ No newline at end of file diff --git a/.idea/encodings.xml b/.idea/encodings.xml deleted file mode 100644 index e206d70..0000000 --- a/.idea/encodings.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml deleted file mode 100644 index 59f68b5..0000000 --- a/.idea/inspectionProfiles/Project_Default.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - \ No newline at end of file diff --git a/.idea/inspectionProfiles/profiles_settings.xml b/.idea/inspectionProfiles/profiles_settings.xml deleted file mode 100644 index 3b31283..0000000 --- a/.idea/inspectionProfiles/profiles_settings.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml deleted file mode 100644 index 1162f43..0000000 --- a/.idea/misc.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/.idea/modules.xml b/.idea/modules.xml deleted file mode 100644 index 7dc8243..0000000 --- a/.idea/modules.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/.idea/php.xml b/.idea/php.xml deleted file mode 100644 index 8ce43b9..0000000 --- a/.idea/php.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/.idea/scopes/scope_settings.xml b/.idea/scopes/scope_settings.xml deleted file mode 100644 index 922003b..0000000 --- a/.idea/scopes/scope_settings.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - \ No newline at end of file diff --git a/.idea/shipping.iml b/.idea/shipping.iml deleted file mode 100644 index 7f11295..0000000 --- a/.idea/shipping.iml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - diff --git a/.idea/vcs.xml b/.idea/vcs.xml deleted file mode 100644 index c80f219..0000000 --- a/.idea/vcs.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/.travis.yml b/.travis.yml index dc191a2..5b5b855 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,6 @@ language: php php: - - 5.4 + - 7.1 before_script: - composer install --prefer-dist diff --git a/composer.json b/composer.json index 9f61f9d..ec1ab92 100644 --- a/composer.json +++ b/composer.json @@ -11,7 +11,7 @@ ], "extra": { "branch-alias": { - "dev-master": "1.0.x-dev" + "dev-master": "1.0.0" } }, "require-dev": { @@ -19,7 +19,7 @@ "squizlabs/php_codesniffer": "1.5.5" }, "require": { - "php": ">=5.4" + "php": ">=7.1" }, "autoload": { "psr-4": {