danielsiepmann/tea
danielsiepmann/tea
1
0
mirror of https://github.com/FriendsOfTYPO3/tea.git synced 2024-11-10 04:36:12 +01:00
Code Activity

[TASK] Switch the code sniffing from PSR-2 to PSR-12 (#35)

Browse source 
Also update the corresponding packages and autoformat the code again.

Fixes #3
This commit is contained in:
Oliver Klee 2019-12-07 17:44:32 +01:00 committed by Andreas Wolf
parent b67a142653
commit a9f64159ec
5 changed files with 7 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CHANGELOG.md
View file

@ -17,6 +17,7 @@ This project adheres to [Semantic Versioning](https://semver.org/).
- Composer script for PHP linting - Composer script for PHP linting
### Changed ### Changed
- Switch from PSR-2 to PSR-12 (#3, #35)
- Move TypoScript linting to GitHub actions (#14) - Move TypoScript linting to GitHub actions (#14)
- Move PHP code sniffing to GitHub actions (#13) - Move PHP code sniffing to GitHub actions (#13)
- Move PHP linting to GitHub actions (#12) - Move PHP linting to GitHub actions (#12)

4
Tests/Unit/Controller/TeaControllerTest.php
View file

@ -5,11 +5,11 @@ declare(strict_types=1);
namespace TTN\Tea\Tests\Unit\Controller; namespace TTN\Tea\Tests\Unit\Controller;
use Nimut\TestingFramework\TestCase\UnitTestCase; use Nimut\TestingFramework\TestCase\UnitTestCase;
use Prophecy\Prophecy\ObjectProphecy;
use Prophecy\Prophecy\ProphecySubjectInterface;
use TTN\Tea\Controller\TeaController; use TTN\Tea\Controller\TeaController;
use TTN\Tea\Domain\Model\Product\Tea; use TTN\Tea\Domain\Model\Product\Tea;
use TTN\Tea\Domain\Repository\Product\TeaRepository; use TTN\Tea\Domain\Repository\Product\TeaRepository;
use Prophecy\Prophecy\ObjectProphecy;
use Prophecy\Prophecy\ProphecySubjectInterface;
use TYPO3\CMS\Extbase\Mvc\Controller\ActionController; use TYPO3\CMS\Extbase\Mvc\Controller\ActionController;
use TYPO3\CMS\Extbase\Persistence\QueryResultInterface; use TYPO3\CMS\Extbase\Persistence\QueryResultInterface;
use TYPO3\CMS\Fluid\View\TemplateView; use TYPO3\CMS\Fluid\View\TemplateView;

2
Tests/Unit/Domain/Repository/Product/TeaRepositoryTest.php
View file

@ -5,8 +5,8 @@ declare(strict_types=1);
namespace TTN\Tea\Tests\Unit\Domain\Repository\Product; namespace TTN\Tea\Tests\Unit\Domain\Repository\Product;
use Nimut\TestingFramework\TestCase\UnitTestCase; use Nimut\TestingFramework\TestCase\UnitTestCase;
use TTN\Tea\Domain\Repository\Product\TeaRepository;
use Prophecy\Prophecy\ProphecySubjectInterface; use Prophecy\Prophecy\ProphecySubjectInterface;
use TTN\Tea\Domain\Repository\Product\TeaRepository;
use TYPO3\CMS\Extbase\Object\ObjectManagerInterface; use TYPO3\CMS\Extbase\Object\ObjectManagerInterface;
use TYPO3\CMS\Extbase\Persistence\Repository; use TYPO3\CMS\Extbase\Persistence\Repository;

4
composer.json
View file

@ -33,12 +33,12 @@
}, },
"require-dev": { "require-dev": {
"codeception/codeception": "^3.0.3", "codeception/codeception": "^3.0.3",
"friendsofphp/php-cs-fixer": "^2.15.1", "friendsofphp/php-cs-fixer": "^2.16.1",
"helhum/typo3-composer-setup": "^0.5.4", "helhum/typo3-composer-setup": "^0.5.4",
"helmich/typo3-typoscript-lint": "^1.5.0", "helmich/typo3-typoscript-lint": "^1.5.0",
"nimut/testing-framework": "^4.1.5", "nimut/testing-framework": "^4.1.5",
"phpunit/phpunit": "^7.5.14", "phpunit/phpunit": "^7.5.14",
"squizlabs/php_codesniffer": "^3.4.2", "squizlabs/php_codesniffer": "^3.5.3",
"typo3/cms-fluid-styled-content": "^9.5" "typo3/cms-fluid-styled-content": "^9.5"
}, },
"replace": { "replace": {

5
phpcs.xml.dist
View file

@ -1,15 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<ruleset name="phpList Coding Standard"> <ruleset name="phpList Coding Standard">
<description> <description>
This standard requires PHP_CodeSniffer >= 3.4.0. This standard requires PHP_CodeSniffer >= 3.5.3.
</description> </description>
<arg name="colors"/> <arg name="colors"/>
<arg name="extensions" value="php"/> <arg name="extensions" value="php"/>
<!--The complete PSR-2 rule set-->
<rule ref="PSR2"/>
<!--The complete PSR-12 rule set--> <!--The complete PSR-12 rule set-->
<rule ref="PSR12"/> <rule ref="PSR12"/>