Merge branch '6.x' into 7.x

Signed-off-by: Mior Muhammad Zaki <crynobone@gmail.com>
orchestral · Jan 13, 2022 · e9b9c56 · e9b9c56
2 parents c81ae8a + 938c722
commit e9b9c56
Show file tree

Hide file tree

Showing 5 changed files with 35 additions and 5 deletions.
diff --git a/CHANGELOG-6.x.md b/CHANGELOG-6.x.md
@@ -2,6 +2,36 @@
 
 This changelog references the relevant changes (bug and security fixes) done to `orchestra/testbench`.
 
+## 6.24.0
+
+Released: 2022-01-13
+
+### Changes
+
+* Update minimum support for Testbench Core v6.28.0+. ([v6.27.4...v6.28.0](https://github.com/orchestral/testbench-core/compare/v6.27.4...v6.28.0))
+
+#### Testbench Changes
+
+##### Changes
+
+* Allow package discoveries by adding `$enablesPacakgeDiscoveries = true` property.
+* Allow to run `defineCacheRoute()` before application is ready.
+* Support defining custom `$basePath` when using `Orchestra\Testbench\container` function.
+
+## 6.23.2
+
+Released: 2021-12-23
+
+### Changes
+
+* Update minimum support for Testbench Core v6.27.4+. ([v6.27.3...v6.27.4](https://github.com/orchestral/testbench-core/compare/v6.27.3...v6.27.4))
+
+#### Testbench Changes
+
+##### Changes
+
+* Update skeleton to match v8.6.10.
+
 ## 6.23.1
 
 Released: 2021-12-04

diff --git a/README.md b/README.md
@@ -5,7 +5,7 @@ Testbench Component is the de-facto package that has been designed to help you w
 
 Before going through the rest of this documentation, please take some time to read the [Package Development](https://laravel.com/docs/8.x/packages) section of Laravel's own documentation, if you haven't done so yet.
 
-[![tests](https://github.com/orchestral/testbench/workflows/tests/badge.svg?branch=master)](https://github.com/orchestral/testbench/actions?query=workflow%3Atests+branch%3Amaster)
+[![tests](https://github.com/orchestral/testbench/workflows/tests/badge.svg?branch=7.x)](https://github.com/orchestral/testbench/actions?query=workflow%3Atests+branch%3A7.x)
 [![Latest Stable Version](https://poser.pugx.org/orchestra/testbench/v/stable)](https://packagist.org/packages/orchestra/testbench)
 [![Total Downloads](https://poser.pugx.org/orchestra/testbench/downloads)](https://packagist.org/packages/orchestra/testbench)
 [![License](https://poser.pugx.org/orchestra/testbench/license)](https://packagist.org/packages/orchestra/testbench)

diff --git a/composer.json b/composer.json
@@ -18,15 +18,15 @@
     },
     "require": {
         "php": "^8.0",
-        "fakerphp/faker": "^1.9.1",
+        "fakerphp/faker": "^1.9.2",
         "laravel/framework": "^9.0",
         "mockery/mockery": "^1.4.4",
         "orchestra/testbench-core": "^7.0",
         "phpunit/phpunit": "^9.5.10 || ^10.0",
         "spatie/laravel-ray": "^1.28",
         "symfony/process": "^6.0",
         "symfony/yaml": "^6.0",
-        "vlucas/phpdotenv": "^5.3"
+        "vlucas/phpdotenv": "^5.4.1"
     },
     "extra": {
         "branch-alias": {

diff --git a/core b/core
diff --git a/sync.sh b/sync.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-BRANCH='master'
+BRANCH='7.x'
 
 echo ">>>> Checkout branch $BRANCH"
 git checkout $BRANCH