Merge branch 'master' into create-func

pdt256 · Dec 12, 2019 · 2e920b5 · 2e920b5
2 parents 0e115da + 2a50506
commit 2e920b5
Show file tree

Hide file tree

Showing 14 changed files with 5 additions and 79 deletions.
diff --git 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
diff --git a/.idea/encodings.xml b/.idea/encodings.xml
diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml
diff --git a/.idea/inspectionProfiles/profiles_settings.xml b/.idea/inspectionProfiles/profiles_settings.xml
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/.idea/modules.xml b/.idea/modules.xml
diff --git a/.idea/php.xml b/.idea/php.xml
diff --git a/.idea/scopes/scope_settings.xml b/.idea/scopes/scope_settings.xml
diff --git a/.idea/shipping.iml b/.idea/shipping.iml
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
diff --git a/.travis.yml b/.travis.yml
@@ -1,8 +1,5 @@
 language: php
 php:
-  - 5.4
-  - 5.5
-  - 5.6
   - 7.1
   - 7.2
   - 7.3

diff --git a/README.md b/README.md
@@ -24,7 +24,7 @@ Add the following lines to your ``composer.json`` file.
 ```JSON
 {
     "require": {
-        "pdt256/shipping": "1.0.*@dev"
+        "pdt256/shipping": "1.0.*"
     }
 }
 ```

diff --git a/composer.json b/composer.json
@@ -11,15 +11,15 @@
     ],
     "extra": {
         "branch-alias": {
-            "dev-master": "1.0.x-dev"
+            "dev-master": "1.0.0"
         }
     },
     "require-dev": {
         "phpunit/phpunit": "7.0.*",
         "squizlabs/php_codesniffer": "3.5.*"
     },
     "require": {
-        "php": ">=5.4"
+        "php": ">=7.1"
     },
     "autoload": {
         "psr-4": {