Skip to content

Commit

Permalink
Laravel 10 stuff
Browse files Browse the repository at this point in the history
  • Loading branch information
Tony BOTALLA committed Feb 24, 2023
1 parent d0a7f15 commit 27da01c
Show file tree
Hide file tree
Showing 10 changed files with 77 additions and 183 deletions.
8 changes: 7 additions & 1 deletion .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,11 @@ trim_trailing_whitespace = true
[*.md]
trim_trailing_whitespace = false

[*.yml]
[*.{js,json,css,yml,yaml}]
indent_size = 2

[composer.json]
indent_size = 4

[docker-compose.yml]
indent_size = 4
1 change: 0 additions & 1 deletion .gitattributes
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,4 @@
.editorconfig export-ignore
.gitattributes export-ignore
.gitignore export-ignore
.php_cs export-ignore
phpunit.xml.dist export-ignore
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -7,3 +7,4 @@ Thumbs.db
/phpunit.xml
/.idea
.phpunit.result.cache
.phpunit.cache
17 changes: 0 additions & 17 deletions .gitlab-ci.yml

This file was deleted.

77 changes: 0 additions & 77 deletions .php_cs

This file was deleted.

20 changes: 0 additions & 20 deletions .travis.yml

This file was deleted.

4 changes: 3 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,9 @@ This package contains some useful Artisan commands.

## Requirements

This version is compatible with Laravel 7.x|8.x|9.x and PHP >= 7.3.
This version is compatible with Laravel 10 and PHP >= 8.1.

For Laravel >= 7.0 and < 10.0 please use 3.* version.

For Laravel >= 6.0 and < 7.0 please use 2.* version.

Expand Down
107 changes: 55 additions & 52 deletions composer.json
Original file line number Diff line number Diff line change
@@ -1,56 +1,59 @@
{
"name": "novius/laravel-artisan-commands",
"description": "Additional artisan commands for Laravel",
"keywords": [
"Artisan",
"Console",
"Commands",
"Laravel"
],
"type": "library",
"license": "AGPL-3.0",
"authors": [
{
"name": "Novius Agency",
"email": "[email protected]",
"homepage": "https://www.novius.com/"
}
],
"require": {
"php": "^7.3|^8.0",
"laravel/framework": "~7.0|~8.0|~9.0"
},
"require-dev": {
"friendsofphp/php-cs-fixer": "^2.16.1",
"phpunit/phpunit": "^8.5",
"orchestra/testbench": "^5.18"
},
"autoload": {
"psr-4": {
"Novius\\ArtisanCommands\\": "src"
}
},
"autoload-dev": {
"psr-4": {
"Novius\\ArtisanCommands\\Tests\\": "tests"
}
},
"scripts": {
"lint" : [
"php-cs-fixer fix --config .php_cs -vv --diff --dry-run --allow-risky=yes"
"name": "novius/laravel-artisan-commands",
"description": "Additional artisan commands for Laravel",
"keywords": [
"Artisan",
"Console",
"Commands",
"Laravel"
],
"type": "library",
"license": "AGPL-3.0",
"authors": [
{
"name": "Novius Agency",
"email": "[email protected]",
"homepage": "https://www.novius.com/"
}
],
"test" : [
"phpunit"
]
},
"extra": {
"laravel": {
"providers": [
"Novius\\ArtisanCommands\\ArtisanCommandsServiceProvider"
]
"require": {
"php": "^8.1",
"laravel/framework": "~10.0"
},
"require-dev": {
"laravel/pint": "^1.0",
"phpunit/phpunit": "^10.0",
"orchestra/testbench": "^8.0"
},
"autoload": {
"psr-4": {
"Novius\\ArtisanCommands\\": "src"
}
},
"autoload-dev": {
"psr-4": {
"Novius\\ArtisanCommands\\Tests\\": "tests"
}
},
"scripts": {
"fmt": [
"./vendor/bin/pint"
],
"lint": [
"@composer fmt -- --test"
],
"test": [
"phpunit"
]
},
"extra": {
"laravel": {
"providers": [
"Novius\\ArtisanCommands\\ArtisanCommandsServiceProvider"
]
}
},
"config": {
"sort-packages": true
}
},
"config": {
"sort-packages": true
}
}
21 changes: 10 additions & 11 deletions phpunit.xml.dist
Original file line number Diff line number Diff line change
@@ -1,19 +1,18 @@
<?xml version="1.0" encoding="UTF-8"?>
<phpunit backupGlobals="false"
backupStaticAttributes="false"
<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
backupGlobals="false"
bootstrap="tests/bootstrap.php"
colors="true"
convertErrorsToExceptions="true"
convertNoticesToExceptions="true"
convertWarningsToExceptions="true"
processIsolation="false"
stopOnError="false"
stopOnFailure="false"
verbose="true"
xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.0/phpunit.xsd"
cacheDirectory=".phpunit.cache"
backupStaticProperties="false"
>
<testsuites>
<testsuite name="Artisan Commands Test Suite">
<directory suffix="Test.php">./tests</directory>
</testsuite>
</testsuites>
<testsuites>
<testsuite name="Artisan Commands Test Suite">
<directory suffix="Test.php">./tests</directory>
</testsuite>
</testsuites>
</phpunit>
4 changes: 1 addition & 3 deletions src/Console/Database/Create.php
Original file line number Diff line number Diff line change
Expand Up @@ -87,10 +87,8 @@ protected function changeDatabaseName(string $databaseName)

/**
* Return complete database connection config name, using $this->connectionName.
*
* @return string
*/
protected function databaseConfigName() : string
protected function databaseConfigName(): string
{
return 'database.connections.'.$this->connectionName.'.database';
}
Expand Down

0 comments on commit 27da01c

Please sign in to comment.