Skip to content

Commit

Permalink
Composer: replace ninjify for contributte
Browse files Browse the repository at this point in the history
  • Loading branch information
f3l1x committed Jun 11, 2023
1 parent ec9bc51 commit 78cfaf0
Show file tree
Hide file tree
Showing 6 changed files with 26 additions and 29 deletions.
9 changes: 3 additions & 6 deletions composer.json
Expand Up @@ -24,12 +24,9 @@
},
"require-dev": {
"mockery/mockery": "^1.3.3",
"ninjify/qa": "^0.13",
"ninjify/nunjuck": "^0.4",
"phpstan/phpstan": "^1.4.0",
"phpstan/phpstan-deprecation-rules": "^1.0.0",
"phpstan/phpstan-nette": "^1.0.0",
"phpstan/phpstan-strict-rules": "^1.0.0"
"contributte/qa": "^0.4",
"contributte/tester": "^0.3",
"contributte/phpstan": "^0.1"
},
"autoload": {
"psr-4": {
Expand Down
16 changes: 8 additions & 8 deletions phpstan.neon
@@ -1,16 +1,16 @@
includes:
- vendor/phpstan/phpstan-deprecation-rules/rules.neon
- vendor/phpstan/phpstan-nette/extension.neon
- vendor/phpstan/phpstan-nette/rules.neon
- vendor/phpstan/phpstan-strict-rules/rules.neon
- vendor/contributte/phpstan/phpstan.neon

parameters:
level: 9
phpVersion: 70200
phpVersion: 80100

paths:
scanDirectories:
- src

reportMaybesInPropertyPhpDocTypes: false
fileExtensions:
- php

ignoreErrors:
paths:
- src
- .docs
19 changes: 10 additions & 9 deletions ruleset.xml
@@ -1,11 +1,9 @@
<?xml version="1.0"?>
<ruleset>
<!-- Contributte Coding Standard -->
<rule ref="./vendor/ninjify/coding-standard/contributte.xml">
<exclude name="SlevomatCodingStandard.Classes.SuperfluousInterfaceNaming.SuperfluousSuffix"/>
</rule>
<?xml version="1.0" encoding="UTF-8"?>
<ruleset name="Contributte" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="vendor/squizlabs/php_codesniffer/phpcs.xsd">
<!-- Rulesets -->
<rule ref="./vendor/contributte/qa/ruleset-8.0.xml"/>

<!-- Specific rules -->
<!-- Rules -->
<rule ref="SlevomatCodingStandard.Files.TypeNameMatchesFileName">
<properties>
<property name="rootNamespaces" type="array">
Expand All @@ -15,7 +13,10 @@
</properties>
</rule>

<!--Exclude folders -->
<rule ref="SlevomatCodingStandard.Classes.SuperfluousInterfaceNaming.SuperfluousSuffix">
<exclude-pattern>src/ContainerAwareInterface.php</exclude-pattern>
</rule>

<!-- Excludes -->
<exclude-pattern>/tests/tmp</exclude-pattern>
</ruleset>

2 changes: 1 addition & 1 deletion src/DI/FixturesExtension.php
Expand Up @@ -33,7 +33,7 @@ public function loadConfiguration(): void

$builder->addDefinition($this->prefix('loadDataFixturesCommand'))
->setFactory(LoadDataFixturesCommand::class)
->addTag(InjectExtension::TAG_INJECT, true)
->addTag(InjectExtension::TagInject, true)
->addTag('console.command', 'doctrine:fixtures:load');
}

Expand Down
5 changes: 2 additions & 3 deletions src/Loader/FixturesLoader.php
Expand Up @@ -10,11 +10,10 @@
class FixturesLoader extends Loader
{

/** @var Container */
private $container;
private Container $container;

/** @var string[] */
private $paths;
private array $paths = [];

/**
* @param string[] $paths
Expand Down
4 changes: 2 additions & 2 deletions tests/Fixtures/ContainerFixture.php
Expand Up @@ -10,8 +10,7 @@
class ContainerFixture implements ContainerAwareInterface, FixtureInterface
{

/** @var Container|NULL */
private $container;
private Container|null $container = null;

public function setContainer(Container $container): void
{
Expand All @@ -25,6 +24,7 @@ public function getContainer(): ?Container

public function load(ObjectManager $manager): void
{
// Implement in child
}

}

0 comments on commit 78cfaf0

Please sign in to comment.