Merge branch '4.x'

Signed-off-by: Mior Muhammad Zaki <[email protected]>
orchestral · Mar 29, 2020 · e6a4072 · e6a4072
2 parents bbb7d14 + c1b7e14
commit e6a4072
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -28,10 +28,10 @@ jobs:
           key: dependencies-php-${{ matrix.php }}-composer-${{ hashFiles('composer.json') }}
 
       - name: Setup PHP
-        uses: shivammathur/setup-php@v1
+        uses: shivammathur/setup-php@v2
         with:
           php-version: ${{ matrix.php }}
-          extensions: dom, curl, libxml, mbstring, zip, pcntl, pdo, sqlite, pdo_sqlite, mysql, mysqli, pdo_mysql, bcmath, soap, intl, gd, exif, iconv, imagick
+          extensions: dom, curl, libxml, mbstring, zip, pcntl, sqlite3, pdo_sqlite, pdo_mysql, bcmath, intl, gd, exif, iconv, imagick
           coverage: none
 
       - name: Install dependencies

diff --git a/composer.json b/composer.json
@@ -25,7 +25,7 @@
         "orchestra/support": "^5.0"
     },
     "require-dev": {
-        "mockery/mockery": "^1.3",
+        "mockery/mockery": "^1.3.1",
         "orchestra/foundation": "^5.0",
         "phpunit/phpunit": "^8.4"
     },