Skip to content

Commit ee14c6a

Browse files
ramseyramsey
authored
chore(deps): allow symfony/console and symfony/process ^6.0 (#96)
1 parent 72e6e3b commit ee14c6a

9 files changed

Lines changed: 56 additions & 61 deletions

File tree

‎.github/workflows/continuous-integration.yml‎

Lines changed: 16 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -27,13 +27,13 @@ jobs:
2727
runs-on: "ubuntu-latest"
2828
steps:
2929
- name: "Checkout repository"
30-
uses: "actions/checkout@v3.0.2"
30+
uses: "actions/checkout@v3.5.3"
3131

3232
- name: "Install PHP"
33-
uses: "shivammathur/setup-php@2.21.2"
33+
uses: "shivammathur/setup-php@2.25.5"
3434
with:
3535
php-version: "latest"
36-
extensions: "intl-70.1"
36+
extensions: "intl-73.2"
3737
coverage: "none"
3838

3939
- name: "Install dependencies (Composer)"
@@ -50,13 +50,13 @@ jobs:
5050
runs-on: "ubuntu-latest"
5151
steps:
5252
- name: "Checkout repository"
53-
uses: "actions/checkout@v3.0.2"
53+
uses: "actions/checkout@v3.5.3"
5454

5555
- name: "Install PHP"
56-
uses: "shivammathur/setup-php@2.21.2"
56+
uses: "shivammathur/setup-php@2.25.5"
5757
with:
5858
php-version: "latest"
59-
extensions: "intl-70.1"
59+
extensions: "intl-73.2"
6060
coverage: "none"
6161

6262
- name: "Install dependencies (Composer)"
@@ -74,13 +74,13 @@ jobs:
7474
runs-on: "ubuntu-latest"
7575
steps:
7676
- name: "Checkout repository"
77-
uses: "actions/checkout@v3.0.2"
77+
uses: "actions/checkout@v3.5.3"
7878

7979
- name: "Install PHP"
80-
uses: "shivammathur/setup-php@2.21.2"
80+
uses: "shivammathur/setup-php@2.25.5"
8181
with:
8282
php-version: "latest"
83-
extensions: "intl-70.1"
83+
extensions: "intl-73.2"
8484
coverage: "none"
8585

8686
- name: "Install dependencies (Composer)"
@@ -100,13 +100,13 @@ jobs:
100100
runs-on: "ubuntu-latest"
101101
steps:
102102
- name: "Checkout repository"
103-
uses: "actions/checkout@v3.0.2"
103+
uses: "actions/checkout@v3.5.3"
104104

105105
- name: "Install PHP"
106-
uses: "shivammathur/setup-php@2.21.2"
106+
uses: "shivammathur/setup-php@2.25.5"
107107
with:
108108
php-version: "latest"
109-
extensions: "intl-70.1"
109+
extensions: "intl-73.2"
110110
coverage: "pcov"
111111
ini-values: "memory_limit=-1"
112112

@@ -131,22 +131,20 @@ jobs:
131131
- "7.4"
132132
- "8.0"
133133
- "8.1"
134+
- "8.2"
134135
dependencies:
135136
- "lowest"
136137
- "highest"
137-
exclude:
138-
- php-version: "8.1"
139-
dependencies: "lowest"
140138

141139
steps:
142140
- name: "Checkout repository"
143-
uses: "actions/checkout@v3.0.2"
141+
uses: "actions/checkout@v3.5.3"
144142

145143
- name: "Install PHP"
146-
uses: "shivammathur/setup-php@2.21.2"
144+
uses: "shivammathur/setup-php@2.25.5"
147145
with:
148146
php-version: "${{ matrix.php-version }}"
149-
extensions: "intl-70.1"
147+
extensions: "intl-73.2"
150148
coverage: "none"
151149

152150
- name: "Install dependencies (Composer)"

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<a href="https://packagist.org/packages/skillshare/formatphp"><img src="https://img.shields.io/packagist/v/skillshare/formatphp.svg?style=flat-square&label=release" alt="Download Package"></a>
1010
<a href="https://php.net"><img src="https://img.shields.io/packagist/php-v/skillshare/formatphp.svg?style=flat-square&colorB=%238892BF" alt="PHP Programming Language"></a>
1111
<a href="https://github.com/skillshare/formatphp/blob/main/LICENSE"><img src="https://img.shields.io/packagist/l/skillshare/formatphp.svg?style=flat-square&colorB=darkcyan" alt="Read License"></a>
12-
<a href="https://github.com/skillshare/formatphp/actions/workflows/continuous-integration.yml"><img src="https://img.shields.io/github/workflow/status/skillshare/formatphp/build/main?style=flat-square&logo=github" alt="Build Status"></a>
12+
<a href="https://github.com/skillshare/formatphp/actions/workflows/continuous-integration.yml"><img src="https://img.shields.io/github/actions/workflow/status/skillshare/formatphp/continuous-integration.yml?branch=main&style=flat-square&logo=github" alt="Build Status"></a>
1313
<a href="https://codecov.io/gh/skillshare/formatphp"><img src="https://img.shields.io/codecov/c/gh/skillshare/formatphp?label=codecov&logo=codecov&style=flat-square" alt="Codecov Code Coverage"></a>
1414
<a href="https://shepherd.dev/github/skillshare/formatphp"><img src="https://img.shields.io/endpoint?style=flat-square&url=https%3A%2F%2Fshepherd.dev%2Fgithub%2Fskillshare%2Fformatphp%2Fcoverage" alt="Psalm Type Coverage"></a>
1515
</p>

‎composer.json‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,13 @@
2020
"ext-intl": "*",
2121
"ext-json": "*",
2222
"ext-mbstring": "*",
23-
"myclabs/php-enum": "^1.8",
23+
"myclabs/php-enum": "^1.8.4",
2424
"nikic/php-parser": "^4.13",
2525
"psr/log": "^1 || ^2",
2626
"ramsey/collection": "^1.2",
27-
"symfony/console": "^5.3",
27+
"symfony/console": "^5.3 || ^6.0",
2828
"symfony/polyfill-php80": "^1.23",
29-
"symfony/process": "^5 || ~6.0.0",
29+
"symfony/process": "^5 || ^6.0",
3030
"webmozart/glob": "^4.4"
3131
},
3232
"require-dev": {
@@ -35,13 +35,15 @@
3535
"ergebnis/composer-normalize": "^2.25",
3636
"hamcrest/hamcrest-php": "^2.0",
3737
"mdwheele/zalgo": "^0.3.1",
38-
"mockery/mockery": "^1.5",
38+
"mockery/mockery": "^1.6.6",
39+
"myclabs/deep-copy": "^1.11",
3940
"php-parallel-lint/php-console-highlighter": "^1.0",
4041
"php-parallel-lint/php-parallel-lint": "^1.3",
4142
"phpstan/extension-installer": "^1.1",
4243
"phpstan/phpstan": "~1.8.0",
4344
"phpstan/phpstan-mockery": "^1.0",
4445
"phpstan/phpstan-phpunit": "^1.1",
46+
"phpunit/phpunit": "^9.0",
4547
"psalm/plugin-mockery": "^0.9.1",
4648
"psalm/plugin-phpunit": "^0.17.0",
4749
"ramsey/coding-standard": "^2.0.3",

‎phpcs.xml.dist‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
<exclude name="SlevomatCodingStandard.Classes.SuperfluousTraitNaming"/>
2020

2121
<!-- Ignore this for PHP 7.4 -->
22+
<exclude name="SlevomatCodingStandard.Functions.RequireTrailingCommaInDeclaration"/>
2223
<exclude name="SlevomatCodingStandard.TypeHints.ParameterTypeHint.MissingNativeTypeHint"/>
2324
</rule>
2425

‎src/Icu/MessageFormat/Parser.php‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -408,10 +408,6 @@ private function parseLiteral(int $nestingLevel, string $parentArgType): Result
408408
* level of the pattern. The new behavior is otherwise compatible.
409409
*
410410
* @param ArgType $parentArgType
411-
*
412-
* @throws Exception\InvalidOffsetException
413-
* @throws Exception\InvalidUtf8CodeBoundaryException
414-
* @throws Exception\InvalidUtf8CodePointException
415411
*/
416412
private function tryParseQuote(string $parentArgType): ?string
417413
{

‎src/Icu/MessageFormat/Parser/Type/ElementType.php‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@
3636
* @method static ElementType Plural()
3737
* @method static ElementType Pound()
3838
* @method static ElementType Tag()
39-
*
4039
* @psalm-immutable
4140
* @extends Enum<int>
4241
*/

‎src/Icu/MessageFormat/Parser/Type/SkeletonType.php‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@
2929
*
3030
* @method static SkeletonType Number()
3131
* @method static SkeletonType DateTime()
32-
*
3332
* @psalm-immutable
3433
* @extends Enum<int>
3534
*/

‎tests/FormatPHPTest.php‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@ public function testFormatDateWithOptions(): void
156156

157157
// Mon, 25 Oct 2021 23:34:12 +0000
158158
$this->assertSame(
159-
'Monday, October 25, 2021 at 11:34:12 PM UTC',
159+
"Monday, October 25, 2021 at 11:34:12\xE2\x80\xAFPM UTC",
160160
$formatphp->formatDate(1635204852, new DateTimeFormatOptions([
161161
'dateStyle' => 'full',
162162
'timeStyle' => 'long',
@@ -217,7 +217,7 @@ public function testFormatTime(): void
217217
$formatphp = new FormatPHP($config, $messageCollection);
218218

219219
$this->assertSame(
220-
'11:34 PM',
220+
"11:34\xE2\x80\xAFPM",
221221
$formatphp->formatTime('Mon, 25 Oct 2021 23:34:12 +0000'),
222222
);
223223
}
@@ -231,7 +231,7 @@ public function testFormatTimeWithOptions(): void
231231

232232
// Mon, 25 Oct 2021 23:34:12 +0000
233233
$this->assertSame(
234-
'11:34:12 PM',
234+
"11:34:12\xE2\x80\xAFPM",
235235
$formatphp->formatTime(1635204852, new DateTimeFormatOptions([
236236
'second' => 'numeric',
237237
])),
@@ -247,7 +247,7 @@ public function testFormatTimeWithTimeStyle(): void
247247

248248
// Mon, 25 Oct 2021 23:34:12 +0000
249249
$this->assertSame(
250-
'11:34:12 PM Coordinated Universal Time',
250+
"11:34:12\xE2\x80\xAFPM Coordinated Universal Time",
251251
$formatphp->formatTime(1635204852, new DateTimeFormatOptions([
252252
'timeStyle' => 'full',
253253
])),
@@ -284,7 +284,7 @@ public function testFormatTimeDoesNotModifyPassedDateTimeFormatOptionsInstance()
284284
$this->assertNull($options->hour);
285285
$this->assertNull($options->minute);
286286

287-
$this->assertSame('8:03 PM', $formatphp->formatTime($time, $options));
287+
$this->assertSame("8:03\xE2\x80\xAFPM", $formatphp->formatTime($time, $options));
288288

289289
// These should still be null after passing them to formatTime().
290290
$this->assertNull($options->hour);
@@ -304,7 +304,7 @@ public function testFormatTimeUsesProvidedHourMinuteOptions(): void
304304
'minute' => '2-digit',
305305
]);
306306

307-
$this->assertSame('8:03 PM', $formatphp->formatTime($time, $options));
307+
$this->assertSame("8:03\xE2\x80\xAFPM", $formatphp->formatTime($time, $options));
308308

309309
// These should not change after being passed to formatTime().
310310
$this->assertSame('2-digit', $options->hour);

0 commit comments

Comments
 (0)