Skip to content

Commit 7d593df

Browse files
driesvintsdriesvints
committed
Merge branch '2.x'
# Conflicts: # CHANGELOG.md # composer.json
2 parents 69d58de + 30e6548 commit 7d593df

15 files changed

+254
-50
lines changed

‎.gitattributes

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,4 +14,5 @@
1414
.gitignore export-ignore
1515
.styleci.yml export-ignore
1616
CHANGELOG.md export-ignore
17+
phpstan.neon.dist export-ignore
1718
phpunit.xml.dist export-ignore

‎.github/ISSUE_TEMPLATE/1_Bug_report.md

Lines changed: 0 additions & 20 deletions
This file was deleted.

‎.github/ISSUE_TEMPLATE/1_Bug_report.yml

Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
name: Bug Report
2+
description: "Report something that's broken."
3+
body:
4+
- type: markdown
5+
attributes:
6+
value: "Please read [our full contribution guide](https://laravel.com/docs/contributions#bug-reports) before submitting bug reports. If you notice improper DocBlock, PHPStan, or IDE warnings while using Laravel, do not create a GitHub issue. Instead, please submit a pull request to fix the problem."
7+
- type: input
8+
attributes:
9+
label: Tinker Version
10+
description: Provide the Tinker version that you are using.
11+
placeholder: 1.6.1
12+
validations:
13+
required: true
14+
- type: input
15+
attributes:
16+
label: Laravel Version
17+
description: Provide the Laravel version that you are using. [Please ensure it is still supported.](https://laravel.com/docs/releases#support-policy)
18+
placeholder: 10.4.1
19+
validations:
20+
required: true
21+
- type: input
22+
attributes:
23+
label: PHP Version
24+
description: Provide the PHP version that you are using.
25+
placeholder: 8.1.4
26+
validations:
27+
required: true
28+
- type: input
29+
attributes:
30+
label: Database Driver & Version
31+
description: If applicable, provide the database driver and version you are using.
32+
placeholder: "MySQL 8.0.31 for macOS 13.0 on arm64 (Homebrew)"
33+
validations:
34+
required: false
35+
- type: textarea
36+
attributes:
37+
label: Description
38+
description: Provide a detailed description of the issue you are facing.
39+
validations:
40+
required: true
41+
- type: textarea
42+
attributes:
43+
label: Steps To Reproduce
44+
description: Provide detailed steps to reproduce your issue. If necessary, please provide a GitHub repository to demonstrate your issue using `laravel new bug-report --github="--public"`.
45+
validations:
46+
required: true
47+

‎.github/workflows/issues.yml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
name: issues
2+
3+
on:
4+
issues:
5+
types: [labeled]
6+
7+
permissions:
8+
issues: write
9+
10+
jobs:
11+
help-wanted:
12+
uses: laravel/.github/.github/workflows/issues.yml@main

‎.github/workflows/pull-requests.yml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
name: pull requests
2+
3+
on:
4+
pull_request_target:
5+
types: [opened]
6+
7+
permissions:
8+
pull-requests: write
9+
10+
jobs:
11+
uneditable:
12+
uses: laravel/.github/.github/workflows/pull-requests.yml@main

‎.github/workflows/static-analysis.yml

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
name: static analysis
2+
3+
on:
4+
push:
5+
branches:
6+
- master
7+
- '*.x'
8+
pull_request:
9+
10+
permissions:
11+
contents: read
12+
13+
jobs:
14+
tests:
15+
uses: laravel/.github/.github/workflows/static-analysis.yml@main

‎.github/workflows/tests.yml

Lines changed: 50 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,44 +2,86 @@ name: tests
22

33
on:
44
push:
5+
branches:
6+
- master
7+
- '*.x'
58
pull_request:
69
schedule:
710
- cron: '0 0 * * *'
811

912
jobs:
1013
tests:
11-
runs-on: ubuntu-20.04
14+
runs-on: ubuntu-22.04
1215

1316
strategy:
1417
fail-fast: true
1518
matrix:
16-
php: [7.2, 7.3, 7.4, 8.0, 8.1]
17-
laravel: [^6.0, ^7.0, ^8.0]
19+
php: [7.2, 7.3, 7.4, '8.0', 8.1, 8.2, 8.3]
20+
laravel: [6, 7, 8, 9, 10, 11]
1821
exclude:
1922
- php: 7.2
20-
laravel: ^8.0
23+
laravel: 8
24+
- php: 7.2
25+
laravel: 9
26+
- php: 7.2
27+
laravel: 10
28+
- php: 7.2
29+
laravel: 11
30+
- php: 7.3
31+
laravel: 9
32+
- php: 7.3
33+
laravel: 10
34+
- php: 7.3
35+
laravel: 11
36+
- php: 7.4
37+
laravel: 9
38+
- php: 7.4
39+
laravel: 10
40+
- php: 7.4
41+
laravel: 11
42+
- php: '8.0'
43+
laravel: 10
44+
- php: '8.0'
45+
laravel: 11
46+
- php: 8.1
47+
laravel: 6
2148
- php: 8.1
22-
laravel: ^6.0
49+
laravel: 7
2350
- php: 8.1
24-
laravel: ^7.0
51+
laravel: 11
52+
- php: 8.2
53+
laravel: 6
54+
- php: 8.2
55+
laravel: 7
56+
- php: 8.2
57+
laravel: 8
58+
- php: 8.3
59+
laravel: 6
60+
- php: 8.3
61+
laravel: 7
62+
- php: 8.3
63+
laravel: 8
64+
- php: 8.3
65+
laravel: 9
2566

2667
name: PHP ${{ matrix.php }} - Laravel ${{ matrix.laravel }}
2768

2869
steps:
2970
- name: Checkout code
30-
uses: actions/checkout@v2
71+
uses: actions/checkout@v4
3172

3273
- name: Setup PHP
3374
uses: shivammathur/setup-php@v2
3475
with:
3576
php-version: ${{ matrix.php }}
3677
extensions: dom, curl, libxml, mbstring, zip
78+
ini-values: error_reporting=E_ALL
3779
tools: composer:v2
3880
coverage: none
3981

4082
- name: Install dependencies
4183
run: |
42-
composer require "illuminate/contracts=${{ matrix.laravel }}" --no-update
84+
composer require "illuminate/contracts=^${{ matrix.laravel }}" --no-update
4385
composer update --prefer-dist --no-interaction --no-progress
4486
4587
- name: Execute tests

‎.github/workflows/update-changelog.yml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
name: update changelog
2+
3+
on:
4+
release:
5+
types: [released]
6+
7+
jobs:
8+
update:
9+
uses: laravel/.github/.github/workflows/update-changelog.yml@main

‎CHANGELOG.md

Lines changed: 58 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,92 +1,137 @@
11
# Release Notes
22

3-
## [Unreleased](https://github.com/laravel/tinker/compare/v2.6.3...master)
3+
## [Unreleased](https://github.com/laravel/tinker/compare/v2.9.0...master)
44

5+
## [v2.9.0](https://github.com/laravel/tinker/compare/v2.8.2...v2.9.0) - 2024-01-04
6+
7+
* Update PsySH dependency to v0.12 by [@bobthecow](https://github.com/bobthecow) in https://github.com/laravel/tinker/pull/170
8+
* [2.x] Merging develop by [@nunomaduro](https://github.com/nunomaduro) in https://github.com/laravel/tinker/pull/171
9+
10+
## [v2.8.2](https://github.com/laravel/tinker/compare/v2.8.1...v2.8.2) - 2023-08-15
11+
12+
- [2.x] Adds type checking by [@nunomaduro](https://github.com/nunomaduro) in https://github.com/laravel/tinker/pull/160
13+
- [2.x] Remove unused `orchestra/testbench` deps by [@crynobone](https://github.com/crynobone) in https://github.com/laravel/tinker/pull/166
14+
15+
## [v2.8.1](https://github.com/laravel/tinker/compare/v2.8.0...v2.8.1) - 2023-02-15
16+
17+
- Cast ProcessResult objects by @mpociot in https://github.com/laravel/tinker/pull/159
18+
19+
## [v2.8.0](https://github.com/laravel/tinker/compare/v2.7.3...v2.8.0) - 2023-01-10
20+
21+
### Added
22+
23+
- Laravel v10 support
24+
25+
## [v2.7.3](https://github.com/laravel/tinker/compare/v2.7.2...v2.7.3) - 2022-11-09
26+
27+
### Changed
28+
29+
- Set raw output when using `--execute` by @innocenzi in https://github.com/laravel/tinker/pull/155
30+
31+
## [v2.7.2](https://github.com/laravel/tinker/compare/v2.7.1...v2.7.2) - 2022-03-23
32+
33+
### Fixed
34+
35+
- Add Laravel app instance to command by @driesvints in https://github.com/laravel/tinker/pull/146
36+
37+
## [v2.7.1](https://github.com/laravel/tinker/compare/v2.7.0...v2.7.1) - 2022-03-15
38+
39+
### Fixed
40+
41+
- Fix command resolving by @driesvints in https://github.com/laravel/tinker/pull/144 and https://github.com/laravel/tinker/commit/1e2d500585a4e546346fadd3adc6f9c1a97e15f4
42+
43+
## [v2.7.0 (2022-01-12)](https://github.com/laravel/tinker/compare/v2.6.3...v2.7.0)
44+
45+
### Changed
46+
47+
- Laravel 9 and psych v0.11.x support ([#139](https://github.com/laravel/tinker/pull/139))
548

649
## [v2.6.3 (2021-12-07)](https://github.com/laravel/tinker/compare/v2.6.2...v2.6.3)
750

851
### Changed
9-
- Add `migrate:install` to whitelisted commands ([#137](https://github.com/laravel/tinker/pull/137))
1052

53+
- Add `migrate:install` to whitelisted commands ([#137](https://github.com/laravel/tinker/pull/137))
1154

1255
## [v2.6.2 (2021-09-28)](https://github.com/laravel/tinker/compare/v2.6.1...v2.6.2)
1356

1457
### Added
15-
- Added custom caster support ([#133](https://github.com/laravel/tinker/pull/133))
1658

59+
- Added custom caster support ([#133](https://github.com/laravel/tinker/pull/133))
1760

1861
## [v2.6.1 (2021-03-02)](https://github.com/laravel/tinker/compare/v2.6.0...v2.6.1)
1962

2063
### Fixed
21-
- Display hidden/appended attributes for models ([#123](https://github.com/laravel/tinker/pull/123))
2264

65+
- Display hidden/appended attributes for models ([#123](https://github.com/laravel/tinker/pull/123))
2366

2467
## [v2.6.0 (2021-01-26)](https://github.com/laravel/tinker/compare/v2.5.0...v2.6.0)
2568

2669
### Added
27-
- Add Stringable caster ([#121](https://github.com/laravel/tinker/pull/121))
2870

71+
- Add Stringable caster ([#121](https://github.com/laravel/tinker/pull/121))
2972

3073
## [v2.5.0 (2020-10-29)](https://github.com/laravel/tinker/compare/v2.4.2...v2.5.0)
3174

3275
### Added
33-
- PHP 8 Support ([#116](https://github.com/laravel/tinker/pull/116))
3476

77+
- PHP 8 Support ([#116](https://github.com/laravel/tinker/pull/116))
3578

3679
## [v2.4.2 (2020-08-11)](https://github.com/laravel/tinker/compare/v2.4.1...v2.4.2)
3780

3881
### Fixed
39-
- Fix missing output while using execute option ([#109](https://github.com/laravel/tinker/pull/109))
4082

83+
- Fix missing output while using execute option ([#109](https://github.com/laravel/tinker/pull/109))
4184

4285
## [v2.4.1 (2020-07-07)](https://github.com/laravel/tinker/compare/v2.4.0...v2.4.1)
4386

4487
### Fixed
45-
- Fixed execute not unregistering loader and exit code ([#100](https://github.com/laravel/tinker/pull/100))
4688

89+
- Fixed execute not unregistering loader and exit code ([#100](https://github.com/laravel/tinker/pull/100))
4790

4891
## [v2.4.0 (2020-04-07)](https://github.com/laravel/tinker/compare/v2.3.0...v2.4.0)
4992

5093
### Changed
51-
- Forward input options to psysh ([#98](https://github.com/laravel/tinker/pull/98))
5294

95+
- Forward input options to psysh ([#98](https://github.com/laravel/tinker/pull/98))
5396

5497
## [v2.3.0 (2020-03-17)](https://github.com/laravel/tinker/compare/v2.2.0...v2.3.0)
5598

5699
### Added
100+
57101
- Allow Laravel 8 ([#90](https://github.com/laravel/tinker/pull/90))
58102
- Allow psy/psysh 0.10 ([#95](https://github.com/laravel/tinker/pull/95))
59103

60-
61104
## [v2.2.0 (2020-02-05)](https://github.com/laravel/tinker/compare/v2.1.0...v2.2.0)
62105

63106
### Added
107+
64108
- Support vendor class aliasing ([#88](https://github.com/laravel/tinker/pull/88))
65109
- Add `--execute` option to console command ([#89](https://github.com/laravel/tinker/pull/89))
66110

67-
68111
## [v2.1.0 (2020-01-14)](https://github.com/laravel/tinker/compare/v2.0.0...v2.1.0)
69112

70113
### Added
71-
- Add `HtmlString` caster ([#87](https://github.com/laravel/tinker/pull/87))
72114

115+
- Add `HtmlString` caster ([#87](https://github.com/laravel/tinker/pull/87))
73116

74117
## [v2.0.0 (2019-11-26)](https://github.com/laravel/tinker/compare/v1.0.10...v2.0.0)
75118

76119
### Added
120+
77121
- Allow Laravel 7 ([#74](https://github.com/laravel/tinker/pull/74))
78122

79123
### Changed
124+
80125
- Require PHP 7.2 as the new minimum version ([8d6104c](https://github.com/laravel/tinker/commit/8d6104cf50695e3f256d0389626c692e144d946b))
81126
- Allow Symfony 5 ([49982fd](https://github.com/laravel/tinker/commit/49982fd563035025998efe7f32d005bc6da2ce0a))
82127
- Laravel now only check for `DeferrableProvider` ([#81](https://github.com/laravel/tinker/pull/81))
83128

84129
### Removed
130+
85131
- Drop support for old Psysh versions ([a05922f](https://github.com/laravel/tinker/commit/a05922fa3b959d92efd16defe8e30a9895a69727))
86132
- Drop Symfony 3.x support ([7175b49](https://github.com/laravel/tinker/commit/7175b4931917d507989cda2c753113f71aa18816))
87133
- Drop support for Laravel 5.x ([4f3e609](https://github.com/laravel/tinker/commit/4f3e6098dff7ec4c0eedc5348184838598bc30c8))
88134

89-
90135
## v1.0.0 (2016-12-30)
91136

92137
Initial commit.

‎composer.json

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,18 +11,19 @@
1111
],
1212
"require": {
1313
"php": "^7.2.5|^8.0",
14-
"illuminate/console": "^6.0|^7.0|^8.0",
15-
"illuminate/contracts": "^6.0|^7.0|^8.0",
16-
"illuminate/support": "^6.0|^7.0|^8.0",
17-
"psy/psysh": "^0.10.4",
18-
"symfony/var-dumper": "^4.3.4|^5.0"
14+
"illuminate/console": "^6.0|^7.0|^8.0|^9.0|^10.0|^11.0",
15+
"illuminate/contracts": "^6.0|^7.0|^8.0|^9.0|^10.0|^11.0",
16+
"illuminate/support": "^6.0|^7.0|^8.0|^9.0|^10.0|^11.0",
17+
"psy/psysh": "^0.11.1|^0.12.0",
18+
"symfony/var-dumper": "^4.3.4|^5.0|^6.0|^7.0"
1919
},
2020
"require-dev": {
2121
"mockery/mockery": "~1.3.3|^1.4.2",
22+
"phpstan/phpstan": "^1.10",
2223
"phpunit/phpunit": "^8.5.8|^9.3.3"
2324
},
2425
"suggest": {
25-
"illuminate/database": "The Illuminate Database package (^6.0|^7.0|^8.0)."
26+
"illuminate/database": "The Illuminate Database package (^6.0|^7.0|^8.0|^9.0|^10.0|^11.0)."
2627
},
2728
"autoload": {
2829
"psr-4": {

0 commit comments

Comments
 (0)