Consistence CS 1.0

build.xml

@@ -9,7 +9,7 @@
 	<property name="path.bin" value="${path.root}/bin"/>
 	<property name="path.composer.executable" value="composer"/>
 	<property name="path.phpcs.executable" value="${path.bin}/phpcs"/>
-	<property name="path.phpcs.ruleset" value="${path.vendor}/consistence/coding-standard/Consistence/ruleset.xml"/>
+	<property name="path.phpcs.ruleset" value="${path.build}/cs-ruleset.xml"/>
 	<property name="path.phplint.executable" value="${path.bin}/parallel-lint"/>
 	<property name="path.phpunit.configuration" value="${path.tests}/phpunit.xml"/>
 	<property name="path.phpunit.executable" value="${path.bin}/phpunit"/>

build/cs-ruleset.xml

@@ -0,0 +1,20 @@
+<?xml version="1.0"?>
+<ruleset name="ConsistenceCodingStandard">
+	<rule ref="../vendor/consistence/coding-standard/Consistence/ruleset.xml">
+		<exclude name="SlevomatCodingStandard.Classes.ClassConstantVisibility"/><!-- requires 7.1+ -->
+		<exclude name="SlevomatCodingStandard.TypeHints.NullableTypeForNullDefaultValue"/><!-- requires PHP 7.1+ -->
+	</rule>
+	<rule ref="SlevomatCodingStandard.Files.TypeNameMatchesFileName">
+		<properties>
+			<property name="rootNamespaces" type="array" value="
+				src => Consistence\Doctrine,
+				tests => Consistence\Doctrine,
+			"/>
+		</properties>
+		<exclude-pattern>*/data/*.php</exclude-pattern>
+		<exclude-pattern>*/exceptions/*Exception.php</exclude-pattern>
+	</rule>
+	<rule ref="SlevomatCodingStandard.Classes.UnusedPrivateElements">
+		<exclude-pattern>*/data/*.php</exclude-pattern>
+	</rule>
+</ruleset>

composer.json

@@ -15,7 +15,7 @@
 		"doctrine/orm": "~2.5.0"
 	},
 	"require-dev": {
-		"consistence/coding-standard": "0.12",
+		"consistence/coding-standard": "1.0",
 		"jakub-onderka/php-console-highlighter": "0.3.2",
 		"jakub-onderka/php-parallel-lint": "0.9.2",
 		"phing/phing": "2.16",

readme.md

@@ -93,7 +93,7 @@ $user = new User(
 	Sex::get(Sex::FEMALE)
 	// ...
 );
-/** @var $entityManager \Doctrine\ORM\EntityManager */
+/** @var \Doctrine\ORM\EntityManager $entityManager */
 $entityManager->persist($user);
 
 // when persisting User::$sex to database, `female` will be saved
@@ -107,7 +107,7 @@ And when you retrieve the entity back from database, you will receive the `Sex`
 
 namespace Consistence\Doctrine\Example\User;
 
-/** @var $entityManager \Doctrine\ORM\EntityManager */
+/** @var \Doctrine\ORM\EntityManager $entityManager */
 $user = $entityManager->find(User::class, 1);
 var_dump($user->getSex());
 
@@ -174,8 +174,8 @@ use Consistence\Doctrine\Enum\EnumPostLoadEntityListener;
 
 use Doctrine\ORM\Events;
 
-/** @var $entityManager \Doctrine\ORM\EntityManager */
-/** @var $annotationDriver \Doctrine\ORM\Mapping\Driver\AnnotationDriver */
+/** @var \Doctrine\ORM\EntityManager $entityManager */
+/** @var \Doctrine\ORM\Mapping\Driver\AnnotationDriver $annotationDriver */
 $annotationDriver = $entityManager->getConfiguration()->getMetadataDriverImpl();
 $annotationReader = $annotationDriver->getReader();
 

src/Enum/EnumPostLoadEntityListener.php

@@ -5,12 +5,10 @@
 namespace Consistence\Doctrine\Enum;
 
 use Consistence\Enum\Enum;
-
 use Doctrine\Common\Annotations\Reader;
 use Doctrine\ORM\EntityManager;
 use Doctrine\ORM\Event\LifecycleEventArgs;
 use Doctrine\ORM\Mapping\ClassMetadata;
-
 use ReflectionClass;
 use ReflectionProperty;
 

src/Enum/Type/IntegerEnumType.php

@@ -17,9 +17,9 @@ public function getName(): string
 	}
 
 	/**
-	 * @param \Consistence\Enum\Enum|integer|null $value
+	 * @param \Consistence\Enum\Enum|int|null $value
 	 * @param \Doctrine\DBAL\Platforms\AbstractPlatform $platform
-	 * @return integer|null
+	 * @return int|null
 	 */
 	public function convertToDatabaseValue($value, AbstractPlatform $platform)
 	{

src/Enum/exceptions/NotEnumException.php

@@ -4,7 +4,7 @@
 
 namespace Consistence\Doctrine\Enum;
 
-class NotEnumException extends \Consistence\PhpException implements \Consistence\Doctrine\Enum\Exception
+class NotEnumException extends \Consistence\PhpException
 {
 
 	/** @var string */

src/Enum/exceptions/UnsupportedClassMetadataException.php

@@ -6,7 +6,7 @@
 
 use Doctrine\ORM\Mapping\ClassMetadata;
 
-class UnsupportedClassMetadataException extends \Consistence\PhpException implements \Consistence\Doctrine\Enum\Exception
+class UnsupportedClassMetadataException extends \Consistence\PhpException
 {
 
 	/** @var string */

tests/Enum/EnumPostLoadEntityListenerTest.php

@@ -9,7 +9,6 @@
 use Doctrine\ORM\EntityManager;
 use Doctrine\ORM\Event\LifecycleEventArgs;
 use Doctrine\ORM\Mapping\ClassMetadata;
-
 use ReflectionClass;
 
 class EnumPostLoadEntityListenerTest extends \PHPUnit\Framework\TestCase

tests/Enum/LoadEnumToEntityIntegrationTest.php

@@ -96,7 +96,7 @@ private function callPostLoadEventOnEntity($entity)
 		];
 		$config = Setup::createAnnotationMetadataConfiguration([__DIR__ . '/data'], true, null, null, false);
 		$entityManager = EntityManager::create($connectionParameters, $config);
-		/** @var $annotationDriver \Doctrine\ORM\Mapping\Driver\AnnotationDriver */
+		/** @var \Doctrine\ORM\Mapping\Driver\AnnotationDriver $annotationDriver */
 		$annotationDriver = $entityManager->getConfiguration()->getMetadataDriverImpl();
 
 		$postLoadListener = new EnumPostLoadEntityListener($annotationDriver->getReader());

tests/Enum/Type/EnumTypeIntegrationTest.php

@@ -5,7 +5,6 @@
 namespace Consistence\Doctrine\Enum\Type;
 
 use Consistence\Enum\Enum;
-
 use Doctrine\DBAL\Platforms\AbstractPlatform;
 use Doctrine\DBAL\Types\Type as DoctrineType;
 

tests/Enum/data/BarEmbeddable.php

@@ -5,7 +5,6 @@
 namespace Consistence\Doctrine\Enum;
 
 use Consistence\Doctrine\Enum\EnumAnnotation as Enum;
-
 use Doctrine\ORM\Mapping as ORM;
 
 /**

tests/Enum/data/BarEntity.php

@@ -5,7 +5,6 @@
 namespace Consistence\Doctrine\Enum;
 
 use Consistence\Doctrine\Enum\EnumAnnotation as Enum;
-
 use Doctrine\ORM\Mapping as ORM;
 
 /**

tests/Enum/data/BaxEntity.php

@@ -5,7 +5,6 @@
 namespace Consistence\Doctrine\Enum;
 
 use Consistence\Doctrine\Enum\EnumAnnotation as Enum;
-
 use Doctrine\ORM\Mapping as ORM;
 
 /**

tests/Enum/data/BazEntity.php

@@ -5,7 +5,6 @@
 namespace Consistence\Doctrine\Enum;
 
 use Consistence\Doctrine\Enum\EnumAnnotation as Enum;
-
 use Doctrine\ORM\Mapping as ORM;
 
 /**

tests/Enum/data/FooEmbeddable.php

@@ -5,7 +5,6 @@
 namespace Consistence\Doctrine\Enum;
 
 use Consistence\Doctrine\Enum\EnumAnnotation as Enum;
-
 use Doctrine\ORM\Mapping as ORM;
 
 /**

tests/Enum/data/FooEntity.php

@@ -5,7 +5,6 @@
 namespace Consistence\Doctrine\Enum;
 
 use Consistence\Doctrine\Enum\EnumAnnotation as Enum;
-
 use Doctrine\ORM\Mapping as ORM;
 
 /**

tests/Enum/data/FooParentEntity.php

@@ -15,7 +15,7 @@ class FooParentEntity
 	/**
 	 * @ORM\Id()
 	 * @ORM\Column(type="integer")
-	 * @var integer
+	 * @var int
 	 */
 	private $id;
 

tests/bootstrap.php

@@ -5,7 +5,6 @@
 use Consistence\Doctrine\Enum\Type\FloatEnumType;
 use Consistence\Doctrine\Enum\Type\IntegerEnumType;
 use Consistence\Doctrine\Enum\Type\StringEnumType;
-
 use Doctrine\Common\Annotations\AnnotationRegistry;
 use Doctrine\DBAL\Types\Type as DoctrineType;