Removed workflow not needed (#241)

Author: Nyholm

.github/workflows/ci.yml

@@ -15,49 +15,47 @@ jobs:
       matrix:
         php: ['5.6', '7.0', '7.1', '7.2', '7.3', '7.4', '8.0']
 
+    services:
+      redis:
+        image: redis:6.0.0
+        ports:
+          - 6379:6379
+      redis-cluster:
+        image: grokzen/redis-cluster:5.0.4
+        ports:
+          - 7000:7000
+          - 7001:7001
+          - 7002:7002
+        env:
+          STANDALONE: 1
+      memcached:
+        image: memcached:1.6.5
+        ports:
+          - 11211:11211
+      mongodb:
+        image: mongo
+        ports:
+          - 27017:27017
+
     steps:
       - name: Set up PHP
         uses: shivammathur/[email protected]
         with:
           php-version: ${{ matrix.php }}
           coverage: none
+          tools: pecl
+          extensions: redis, memcached, mongodb, apcu, apc
+          ini-values: apc.enable_cli=1
 
       - name: Checkout code
         uses: actions/checkout@v2
 
-      - name: Download phpunit
-        run: |
-          rm composer.*
-          composer init --no-interaction --name "php-cache/cache"
-
-          echo ::group::Download
-          composer require symfony/phpunit-bridge
-          echo ::endgroup::
-
-          echo ::group::Install
-          ./vendor/bin/simple-phpunit install
-          echo ::endgroup::
-
-      - name: Modify composer.json
-        run: |
-          CURRENT_DIR=$(pwd)
-          for PACKAGE in $(find src -maxdepth 4 -type f -name phpunit.xml.dist -printf '%h\n' | sort)
-          do
-            echo ::group::mi$PACKAGE
-            echo "$CURRENT_DIR/$PACKAGE"
-            cd "$CURRENT_DIR/$PACKAGE"
-
-            sed -i -re 's/"require": \{/"minimum-stability": "dev","prefer-stable": true,"require": \{/' composer.json
-            cat composer.json
-
-            echo ::endgroup::
-          done
-
       - name: Download dependencies
         env:
           PHP_VERSION: ${{ matrix.php }}
         run: |
           CURRENT_DIR=$(pwd)
+          ok=0
           for PACKAGE in $(find src -maxdepth 4 -type f -name phpunit.xml.dist -printf '%h\n' | sort)
           do
             echo ::group::$PACKAGE
@@ -69,21 +67,31 @@ jobs:
               COMPOSER_OPTIONS=' --ignore-platform-req=php'
             fi
             composer update --no-interaction --prefer-dist --optimize-autoloader $COMPOSER_OPTIONS || localExit=1
+            ok=$(( $localExit || $ok ))
             echo ::endgroup::
             if [ $localExit -ne 0 ]; then
               echo "::error::$PACKAGE error"
-              exit $localExit
             fi
           done
 
+          if [ $PHP_VERSION = '5.6' ]; then
+            exit 0
+          fi
+
+          exit $ok
+
       - name: Run tests
         run: |
+          CURRENT_DIR=$(pwd)
           ok=0
           for PACKAGE in $(find src -maxdepth 4 -type f -name phpunit.xml.dist -printf '%h\n' | sort)
           do
             echo ::group::$PACKAGE
+            echo "$CURRENT_DIR/$PACKAGE"
+            cd "$CURRENT_DIR/$PACKAGE"
+
             localExit=0
-            ./vendor/bin/simple-phpunit -c ./$PACKAGE 2>&1 || localExit=1
+            ./vendor/bin/phpunit 2>&1 || localExit=1
             ok=$(( $localExit || $ok ))
             echo ::endgroup::
             if [ $localExit -ne 0 ]; then

.github/workflows/php.yml

@@ -35,10 +35,22 @@ jobs:
     name: Psalm
     runs-on: ubuntu-latest
     steps:
+      - name: Set up PHP
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: '7.4'
+          extensions: redis, memcached, apcu
+          tools: composer:v2
+
       - name: Checkout code
         uses: actions/checkout@v2
 
+      - name: Download dependencies
+        run: |
+          composer require --dev --no-update psalm/phar:3.16
+          composer update --no-interaction --prefer-dist
+
       - name: Psalm
-        uses: docker://vimeo/psalm-github-actions:3.17.2
-        with:
-          args: --no-progress --show-info=false --stats
+        run: |
+          ./vendor/bin/psalm.phar --version
+          ./vendor/bin/psalm.phar --output-format=github --no-progress --show-info=false --stats

.github/workflows/static.yml

@@ -11,6 +11,7 @@
         <directory name="src" />
         <ignoreFiles>
             <directory name="src/Adapter/*/Tests" />
+            <directory name="src/Adapter/MongoDB" />
             <directory name="src/Bridge/*/Tests" />
             <directory name="src/Encryption/Tests" />
             <directory name="src/Hierarchy/Tests" />

psalm.xml

@@ -24,7 +24,7 @@ class IntegrationPoolTest extends BaseTest
 
     public function createCachePool()
     {
-        if (defined('HHVM_VERSION') || !function_exists('apcu_store')) {
+        if (defined('HHVM_VERSION') || !function_exists('apcu_store') || (function_exists('apcu_enabled') && !apcu_enabled())) {
             $this->markTestSkipped();
         }
 

src/Adapter/Apcu/Tests/IntegrationPoolTest.php

@@ -18,7 +18,7 @@ class IntegrationSimpleCachelTest extends BaseTest
 {
     public function createSimpleCache()
     {
-        if (defined('HHVM_VERSION') || !function_exists('apcu_store')) {
+        if (defined('HHVM_VERSION') || !function_exists('apcu_store') || (function_exists('apcu_enabled') && !apcu_enabled())) {
             $this->markTestSkipped();
         }
 

src/Adapter/Apcu/Tests/IntegrationSimpleCachelTest.php

@@ -18,7 +18,7 @@ class IntegrationTagTest extends TaggableCachePoolTest
 {
     public function createCachePool()
     {
-        if (defined('HHVM_VERSION') || !function_exists('apcu_store')) {
+        if (defined('HHVM_VERSION') || !function_exists('apcu_store') || (function_exists('apcu_enabled') && !apcu_enabled())) {
             $this->markTestSkipped();
         }