Skip to content

Commit 597865f

Browse files
andrey-helldarandrey-helldar
authored
Merge pull request #13 from Laravel-Lang/2.x
Added Laravel 11 support
2 parents 9b702b7 + 2cf8c89 commit 597865f

11 files changed

+112
-51
lines changed

‎composer.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,11 @@
1616
],
1717
"require": {
1818
"php": "^8.1",
19-
"illuminate/support": "^10.0",
20-
"illuminate/translation": "^10.0"
19+
"illuminate/support": "^10.0 || ^11.0",
20+
"illuminate/translation": "^10.0 || ^11.0"
2121
},
2222
"require-dev": {
23-
"orchestra/testbench": "^8.0",
23+
"orchestra/testbench": "^8.0 || ^9.0",
2424
"phpunit/phpunit": "^10.0"
2525
},
2626
"minimum-stability": "stable",

‎phpunit.php

-41
This file was deleted.

‎phpunit.xml

+5-7
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,24 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22

33
<!--~
4-
~ This file is part of the "Laravel-Lang/publisher" project.
4+
~ This file is part of the "dragon-code/json-fallback" project.
55
~
66
~ For the full copyright and license information, please view the LICENSE
77
~ file that was distributed with this source code.
88
~
99
~ @author Andrey Helldar <[email protected]>
10-
~
11-
~ @copyright 2022 Andrey Helldar
12-
~
10+
~ @copyright 2024 Andrey Helldar
1311
~ @license MIT
1412
~
15-
~ @see https://github.com/Laravel-Lang/publisher
13+
~ @see https://github.com/TheDragonCode/json-fallback
1614
-->
1715

1816
<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
19-
xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd"
17+
xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.0/phpunit.xsd"
2018
cacheResult="false"
2119
backupGlobals="false"
2220
backupStaticAttributes="false"
23-
bootstrap="phpunit.php"
21+
bootstrap="vendor/autoload.php"
2422
colors="true"
2523
convertErrorsToExceptions="true"
2624
convertNoticesToExceptions="true"

‎src/TranslationServiceProvider.php

+13
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,18 @@
11
<?php
22

3+
/**
4+
* This file is part of the "dragon-code/json-fallback" project.
5+
*
6+
* For the full copyright and license information, please view the LICENSE
7+
* file that was distributed with this source code.
8+
*
9+
* @author Andrey Helldar <[email protected]>
10+
* @copyright 2024 Andrey Helldar
11+
* @license MIT
12+
*
13+
* @see https://github.com/TheDragonCode/json-fallback
14+
*/
15+
316
declare(strict_types=1);
417

518
namespace LaravelLang\JsonFallback;

‎src/Translator.php

+13
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,18 @@
11
<?php
22

3+
/**
4+
* This file is part of the "dragon-code/json-fallback" project.
5+
*
6+
* For the full copyright and license information, please view the LICENSE
7+
* file that was distributed with this source code.
8+
*
9+
* @author Andrey Helldar <[email protected]>
10+
* @copyright 2024 Andrey Helldar
11+
* @license MIT
12+
*
13+
* @see https://github.com/TheDragonCode/json-fallback
14+
*/
15+
316
declare(strict_types=1);
417

518
namespace LaravelLang\JsonFallback;

‎tests/TestCase.php

+13
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,18 @@
11
<?php
22

3+
/**
4+
* This file is part of the "dragon-code/json-fallback" project.
5+
*
6+
* For the full copyright and license information, please view the LICENSE
7+
* file that was distributed with this source code.
8+
*
9+
* @author Andrey Helldar <[email protected]>
10+
* @copyright 2024 Andrey Helldar
11+
* @license MIT
12+
*
13+
* @see https://github.com/TheDragonCode/json-fallback
14+
*/
15+
316
declare(strict_types=1);
417

518
namespace Tests;

‎tests/Unit/DefaultTest.php

+13
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,18 @@
11
<?php
22

3+
/**
4+
* This file is part of the "dragon-code/json-fallback" project.
5+
*
6+
* For the full copyright and license information, please view the LICENSE
7+
* file that was distributed with this source code.
8+
*
9+
* @author Andrey Helldar <[email protected]>
10+
* @copyright 2024 Andrey Helldar
11+
* @license MIT
12+
*
13+
* @see https://github.com/TheDragonCode/json-fallback
14+
*/
15+
316
declare(strict_types=1);
417

518
namespace Tests\Unit;

‎tests/Unit/FallbackTest.php

+13
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,18 @@
11
<?php
22

3+
/**
4+
* This file is part of the "dragon-code/json-fallback" project.
5+
*
6+
* For the full copyright and license information, please view the LICENSE
7+
* file that was distributed with this source code.
8+
*
9+
* @author Andrey Helldar <[email protected]>
10+
* @copyright 2024 Andrey Helldar
11+
* @license MIT
12+
*
13+
* @see https://github.com/TheDragonCode/json-fallback
14+
*/
15+
316
declare(strict_types=1);
417

518
namespace Tests\Unit;

‎tests/fixtures/default/en/custom.php

+13
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,18 @@
11
<?php
22

3+
/**
4+
* This file is part of the "dragon-code/json-fallback" project.
5+
*
6+
* For the full copyright and license information, please view the LICENSE
7+
* file that was distributed with this source code.
8+
*
9+
* @author Andrey Helldar <[email protected]>
10+
* @copyright 2024 Andrey Helldar
11+
* @license MIT
12+
*
13+
* @see https://github.com/TheDragonCode/json-fallback
14+
*/
15+
316
declare(strict_types=1);
417

518
return [

‎tests/fixtures/default/fr/custom.php

+13
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,18 @@
11
<?php
22

3+
/**
4+
* This file is part of the "dragon-code/json-fallback" project.
5+
*
6+
* For the full copyright and license information, please view the LICENSE
7+
* file that was distributed with this source code.
8+
*
9+
* @author Andrey Helldar <[email protected]>
10+
* @copyright 2024 Andrey Helldar
11+
* @license MIT
12+
*
13+
* @see https://github.com/TheDragonCode/json-fallback
14+
*/
15+
316
declare(strict_types=1);
417

518
return [

‎tests/fixtures/fallback/fr/custom.php

+13
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,18 @@
11
<?php
22

3+
/**
4+
* This file is part of the "dragon-code/json-fallback" project.
5+
*
6+
* For the full copyright and license information, please view the LICENSE
7+
* file that was distributed with this source code.
8+
*
9+
* @author Andrey Helldar <[email protected]>
10+
* @copyright 2024 Andrey Helldar
11+
* @license MIT
12+
*
13+
* @see https://github.com/TheDragonCode/json-fallback
14+
*/
15+
316
declare(strict_types=1);
417

518
return [

0 commit comments

Comments
 (0)