Skip to content

Commit

Permalink
Merge branch '6.x' into 7.x
Browse files Browse the repository at this point in the history
Signed-off-by: Mior Muhammad Zaki <crynobone@gmail.com>
  • Loading branch information
crynobone committed Oct 9, 2023
2 parents 3e493a4 + 5fc3f00 commit 0956340
Show file tree
Hide file tree
Showing 5 changed files with 21 additions and 5 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/tests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ jobs:

steps:
- name: Checkout repository and submodules
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
submodules: recursive

Expand Down
15 changes: 15 additions & 0 deletions CHANGELOG-6.x.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,21 @@

This changelog references the relevant changes (bug and security fixes) done to `orchestra/testbench`.

## 6.36.0

Released: 2023-10-09

### Changes

* Update minimum support for Testbench Core v6.40.0+. ([v6.39.0...v6.40.0](https://github.com/orchestral/testbench-core/compare/v6.39.0...v6.40.0))

#### Testbench Changes

##### Changes

* Code refactors.
* Mark `Orchestra\Testbench\Bootstrap\LoadEnvironmentVariables` class as `@internal`.

## 6.35.0

Released: 2023-09-25
Expand Down
2 changes: 1 addition & 1 deletion bin/sync
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ require __DIR__.'/../vendor/autoload.php';

$files = new Illuminate\Filesystem\Filesystem();

echo ">>>> Checkout branch {$BRANCH}";
echo ">>>> Checkout branch {$BRANCH}".PHP_EOL;

Illuminate\Support\Collection::make([
"git checkout $BRANCH",
Expand Down
5 changes: 3 additions & 2 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@
"fakerphp/faker": "^1.21",
"laravel/framework": "^9.52.15",
"mockery/mockery": "^1.5.1",
"orchestra/testbench-core": "^7.32",
"orchestra/workbench": "^0.4.0",
"orchestra/testbench-core": "^7.33",
"orchestra/workbench": "^0.4.0 || ^0.5.0",
"phpunit/phpunit": "^9.5.10",
"spatie/laravel-ray": "^1.32.4",
"symfony/process": "^6.0.9",
Expand All @@ -48,5 +48,6 @@
"config": {
"sort-packages": true
},
"prefer-stable": true,
"minimum-stability": "dev"
}
2 changes: 1 addition & 1 deletion core
Submodule core updated 157 files

0 comments on commit 0956340

Please sign in to comment.