(chore): SK20292: update phpunit + add query_args

OpenWebconcept · Aug 2, 2019 · 3b94720 · 3b94720
1 parent 6094991
commit 3b94720
Show file tree

Hide file tree

Showing 40 changed files with 1,774 additions and 1,079 deletions.
diff --git a/.gitignore b/.gitignore
@@ -97,3 +97,8 @@ vendor
 
 tests/coverage
 wp-content/
+
+.DS_Store
+
+# php cs
+.php_cs.cache
diff --git a/autoloader.php b/autoloader.php
@@ -22,4 +22,4 @@ public function __construct()
             }
         });
     }
-}
+}
diff --git a/bitbucket-pipelines.yml b/bitbucket-pipelines.yml
@@ -1,27 +1,35 @@
-image: oktupol/bitbucket-pipelines-php71
+image: yardinternet/php7.2-composer
 
 pipelines:
+  custom:
+    manually:
+      - step:
+          name: unit test
+          caches:
+            - composer
+            - vendor-directory
+          script:
+            - composer install --no-interaction --no-progress --prefer-dist --ignore-platform-reqs
+            - ./vendor/bin/phpunit --testsuite "Unit Test Suite"
   branches:
-    master:
-    - step:
-        name: unit test
-        caches:
-          - composer
-          - vendor-directory
-        script:
-          - apt-get update && apt-get install -y git openssh-server
-          - composer install --no-interaction --no-progress --prefer-dist --ignore-platform-reqs
-          - ./vendor/bin/phpunit --testsuite "Unit Test Suite"
-    - step:
-        name: Deploy docs to production
-        caches:
-          - composer
-          - vendor-directory
-        deployment: production
-        script:
-          - apt-get update && apt-get install -y git openssh-server rsync
-          - composer docs
-          - ssh [email protected] mkdir -p /data/www/docs.openwebconcept.nl/htdocs/plugins/openpub && rsync -avH ./docs/* -e "ssh" [email protected]:/data/www/docs.openwebconcept.nl/htdocs/plugins/openpub
+    "{master,develop}":
+      - step:
+          name: unit test
+          caches:
+            - composer
+            - vendor-directory
+          script:
+            - composer install --no-interaction --no-progress --prefer-dist --ignore-platform-reqs
+            - ./vendor/bin/phpunit --testsuite "Unit Test Suite"
+      - step:
+          name: Deploy docs to production
+          caches:
+            - composer
+            - vendor-directory
+          deployment: production
+          script:
+            - apt-get update && apt-get install -y rsync
+            - ssh [email protected] mkdir -p /data/www/docs.openwebconcept.nl/htdocs/plugins/openpub && rsync -avH ./docs/* -e "ssh" [email protected]:/data/www/docs.openwebconcept.nl/htdocs/plugins/openpub
 
 definitions:
   caches:

diff --git a/composer.json b/composer.json
@@ -21,7 +21,7 @@
   },
   "require-dev": {
     "mockery/mockery": "1.0.*",
-    "phpunit/phpunit": "~7.0",
+    "phpunit/phpunit": "~8.0",
     "10up/wp_mock": "dev-master",
     "phpdocumentor/phpdocumentor": "2.*",
     "squizlabs/php_codesniffer": "^3.0.2"
-Original file line number
+Diff line change
@@ Expand Up / @@ -22,4 +22,4 @@ public function __construct() @@
                 }
             });
         }
-    }
+    }