Update coding standard

lookyman · lookyman · commit c6ee41797df7 · 2018-01-18T10:10:09.000+01:00
diff --git a/composer.json b/composer.json
@@ -18,9 +18,9 @@
     "phpstan/phpstan": "^0.9.0",
     "phpunit/phpunit": "^6.4",
     "phpstan/phpstan-phpunit": "^0.9.0",
-    "lookyman/coding-standard": "^0.0.6",
     "symfony/framework-bundle": "^4.0",
-    "phpstan/phpstan-strict-rules": "^0.9.0"
+    "phpstan/phpstan-strict-rules": "^0.9.0",
+    "lookyman/coding-standard": "0.1.0"
   },
   "autoload": {
     "psr-4": {
diff --git a/phpcs.xml.dist b/phpcs.xml.dist
@@ -1,6 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ruleset name="PHPStan Symfony">
-    <rule ref="vendor/lookyman/coding-standard/LookymanCodingStandard/ruleset-7.0.xml">
-        <exclude name="SlevomatCodingStandard.Namespaces.ReferenceUsedNamesOnly.ReferenceViaFullyQualifiedName"/>
-    </rule>
+    <rule ref="vendor/lookyman/coding-standard/LookymanCodingStandard/ruleset.xml"/>
 </ruleset>
diff --git a/src/Exception/XmlContainerNotExistsException.php b/src/Exception/XmlContainerNotExistsException.php
@@ -1,6 +1,5 @@
 <?php
-
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace Lookyman\PHPStan\Symfony\Exception;
 
diff --git a/src/Rules/ContainerInterfacePrivateServiceRule.php b/src/Rules/ContainerInterfacePrivateServiceRule.php
@@ -1,6 +1,5 @@
 <?php
-
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace Lookyman\PHPStan\Symfony\Rules;
 
diff --git a/src/Rules/ContainerInterfaceUnknownServiceRule.php b/src/Rules/ContainerInterfaceUnknownServiceRule.php
@@ -1,6 +1,5 @@
 <?php
-
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace Lookyman\PHPStan\Symfony\Rules;
 
diff --git a/src/ServiceMap.php b/src/ServiceMap.php
@@ -1,6 +1,5 @@
 <?php
-
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace Lookyman\PHPStan\Symfony;
 
@@ -56,21 +55,13 @@ public function __construct(string $containerXml)
 		}
 	}
 
-	/**
-	 * @param Node $node
-	 * @return array|null
-	 */
-	public function getServiceFromNode(Node $node)
+	public function getServiceFromNode(Node $node): ?array
 	{
 		$serviceId = self::getServiceIdFromNode($node);
 		return $serviceId !== \null && \array_key_exists($serviceId, $this->services) ? $this->services[$serviceId] : \null;
 	}
 
-	/**
-	 * @param Node $node
-	 * @return string|null
-	 */
-	public static function getServiceIdFromNode(Node $node)
+	public static function getServiceIdFromNode(Node $node): ?string
 	{
 		if ($node instanceof String_) {
 			return $node->value;
diff --git a/src/Type/ContainerInterfaceDynamicReturnTypeExtension.php b/src/Type/ContainerInterfaceDynamicReturnTypeExtension.php
@@ -1,6 +1,5 @@
 <?php
-
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace Lookyman\PHPStan\Symfony\Type;
 
diff --git a/src/Type/ControllerDynamicReturnTypeExtension.php b/src/Type/ControllerDynamicReturnTypeExtension.php
@@ -1,6 +1,5 @@
 <?php
-
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace Lookyman\PHPStan\Symfony\Type;
 
diff --git a/tests/Rules/ContainerInterfacePrivateServiceRuleTest.php b/tests/Rules/ContainerInterfacePrivateServiceRuleTest.php
@@ -1,6 +1,5 @@
 <?php
-
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace Lookyman\PHPStan\Symfony\Rules;
 
@@ -17,12 +16,12 @@ protected function getRule(): Rule
 		return new ContainerInterfacePrivateServiceRule($serviceMap);
 	}
 
-	public function testGetPrivateService()
+	public function testGetPrivateService(): void
 	{
 		$this->analyse([__DIR__ . '/data/ExampleController.php'], [
 			[
 				'Service "private" is private.',
-				15,
+				14,
 			],
 		]);
 	}
diff --git a/tests/Rules/ContainerInterfaceUnknownServiceRuleTest.php b/tests/Rules/ContainerInterfaceUnknownServiceRuleTest.php
@@ -1,6 +1,5 @@
 <?php
-
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace Lookyman\PHPStan\Symfony\Rules;
 
@@ -17,20 +16,20 @@ protected function getRule(): Rule
 		return new ContainerInterfaceUnknownServiceRule($serviceMap);
 	}
 
-	public function testGetUnknownService()
+	public function testGetUnknownService(): void
 	{
 		$this->analyse([__DIR__ . '/data/ExampleController.php'], [
 			[
 				'Service "service.not.found" is not registered in the container.',
-				21,
+				20,
 			],
 			[
 				'Service "Lookyman\PHPStan\Symfony\ServiceMap" is not registered in the container.',
-				27,
+				26,
 			],
 			[
 				'Service "service.Lookyman\PHPStan\Symfony\ServiceMap" is not registered in the container.',
-				39,
+				38,
 			],
 		]);
 	}
diff --git a/tests/Rules/data/ExampleController.php b/tests/Rules/data/ExampleController.php
@@ -1,6 +1,5 @@
 <?php
-
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace Lookyman\PHPStan\Symfony\Rules\data;
 
@@ -10,37 +9,37 @@
 final class ExampleController extends Controller
 {
 
-	public function getPrivateServiceAction()
+	public function getPrivateServiceAction(): void
 	{
 		$service = $this->get('private');
 		$service->noMethod();
 	}
 
-	public function getUnknownService()
+	public function getUnknownService(): void
 	{
 		$service = $this->get('service.not.found');
 		$service->noMethod();
 	}
 
-	public function getUnknownServiceByClass()
+	public function getUnknownServiceByClass(): void
 	{
 		$service = $this->get(ServiceMap::class);
 		$service->noMethod();
 	}
 
-	public function getVariableService(string $serviceKey)
+	public function getVariableService(string $serviceKey): void
 	{
 		$service = $this->get($serviceKey);
 		$service->noMethod();
 	}
 
-	public function getConcatenatedService()
+	public function getConcatenatedService(): void
 	{
 		$service = $this->get('service.' . ServiceMap::class);
 		$service->noMethod();
 	}
 
-	public function getSelfService()
+	public function getSelfService(): void
 	{
 		$service = $this->get(self::class);
 		$service->noMethod();
diff --git a/tests/ServiceMapTest.php b/tests/ServiceMapTest.php
@@ -1,6 +1,5 @@
 <?php
-
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace Lookyman\PHPStan\Symfony;
 
@@ -18,7 +17,7 @@ final class ServiceMapTest extends TestCase
 	/**
 	 * @dataProvider getServiceFromNodeProvider
 	 */
-	public function testGetServiceFromNode(array $service)
+	public function testGetServiceFromNode(array $service): void
 	{
 		$serviceMap = new ServiceMap(__DIR__ . '/container.xml');
 		self::assertEquals($service, $serviceMap->getServiceFromNode(new String_($service['id'])));
@@ -27,7 +26,7 @@ public function testGetServiceFromNode(array $service)
 	/**
 	 * @expectedException \Lookyman\PHPStan\Symfony\Exception\XmlContainerNotExistsException
 	 */
-	public function testFileNotExists()
+	public function testFileNotExists(): void
 	{
 		new ServiceMap(__DIR__ . '/foo.xml');
 	}
@@ -45,7 +44,7 @@ public function getServiceFromNodeProvider(): array
 		];
 	}
 
-	public function testGetServiceIdFromNode()
+	public function testGetServiceIdFromNode(): void
 	{
 		self::assertEquals('foo', ServiceMap::getServiceIdFromNode(new String_('foo')));
 		self::assertEquals('bar', ServiceMap::getServiceIdFromNode(new ClassConstFetch(new Name('bar'), '')));
diff --git a/tests/Type/ContainerInterfaceDynamicReturnTypeExtensionTest.php b/tests/Type/ContainerInterfaceDynamicReturnTypeExtensionTest.php
@@ -1,6 +1,5 @@
 <?php
-
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace Lookyman\PHPStan\Symfony\Type;
 
@@ -22,21 +21,21 @@
 final class ContainerInterfaceDynamicReturnTypeExtensionTest extends TestCase
 {
 
-	public function testImplementsDynamicMethodReturnTypeExtension()
+	public function testImplementsDynamicMethodReturnTypeExtension(): void
 	{
 		self::assertInstanceOf(
 			DynamicMethodReturnTypeExtension::class,
 			new ContainerInterfaceDynamicReturnTypeExtension(new ServiceMap(__DIR__ . '/../container.xml'))
 		);
 	}
 
-	public function testGetClass()
+	public function testGetClass(): void
 	{
 		$extension = new ContainerInterfaceDynamicReturnTypeExtension(new ServiceMap(__DIR__ . '/../container.xml'));
 		self::assertEquals('Symfony\Component\DependencyInjection\ContainerInterface', $extension->getClass());
 	}
 
-	public function testIsMethodSupported()
+	public function testIsMethodSupported(): void
 	{
 		$methodGet = $this->createMock(MethodReflection::class);
 		$methodGet->expects(self::once())->method('getName')->willReturn('get');
@@ -52,7 +51,7 @@ public function testIsMethodSupported()
 	/**
 	 * @dataProvider getTypeFromMethodCallProvider
 	 */
-	public function testGetTypeFromMethodCall(MethodReflection $methodReflection, MethodCall $methodCall, Type $expectedType)
+	public function testGetTypeFromMethodCall(MethodReflection $methodReflection, MethodCall $methodCall, Type $expectedType): void
 	{
 		$extension = new ContainerInterfaceDynamicReturnTypeExtension(new ServiceMap(__DIR__ . '/../container.xml'));
 		$type = $extension->getTypeFromMethodCall(
diff --git a/tests/Type/ControllerDynamicReturnTypeExtensionTest.php b/tests/Type/ControllerDynamicReturnTypeExtensionTest.php
@@ -1,6 +1,5 @@
 <?php
-
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace Lookyman\PHPStan\Symfony\Type;
 
@@ -22,21 +21,21 @@
 final class ControllerDynamicReturnTypeExtensionTest extends TestCase
 {
 
-	public function testImplementsDynamicMethodReturnTypeExtension()
+	public function testImplementsDynamicMethodReturnTypeExtension(): void
 	{
 		self::assertInstanceOf(
 			DynamicMethodReturnTypeExtension::class,
 			new ControllerDynamicReturnTypeExtension(new ServiceMap(__DIR__ . '/../container.xml'))
 		);
 	}
 
-	public function testGetClass()
+	public function testGetClass(): void
 	{
 		$extension = new ControllerDynamicReturnTypeExtension(new ServiceMap(__DIR__ . '/../container.xml'));
 		self::assertEquals('Symfony\Bundle\FrameworkBundle\Controller\Controller', $extension->getClass());
 	}
 
-	public function testIsMethodSupported()
+	public function testIsMethodSupported(): void
 	{
 		$methodGet = $this->createMock(MethodReflection::class);
 		$methodGet->expects(self::once())->method('getName')->willReturn('get');
@@ -52,7 +51,7 @@ public function testIsMethodSupported()
 	/**
 	 * @dataProvider getTypeFromMethodCallProvider
 	 */
-	public function testGetTypeFromMethodCall(MethodReflection $methodReflection, MethodCall $methodCall, Type $expectedType)
+	public function testGetTypeFromMethodCall(MethodReflection $methodReflection, MethodCall $methodCall, Type $expectedType): void
 	{
 		$extension = new ControllerDynamicReturnTypeExtension(new ServiceMap(__DIR__ . '/../container.xml'));
 		$type = $extension->getTypeFromMethodCall(

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,5 @@`
`1`	`1`	`<?php`
`2`		`-`
`3`		`-declare(strict_types = 1);`
	`2`	`+declare(strict_types=1);`
`4`	`3`
`5`	`4`	`namespace Lookyman\PHPStan\Symfony;`
`6`	`5`
`@@ -56,21 +55,13 @@ public function __construct(string $containerXml)`
`56`	`55`	`}`
`57`	`56`	`}`
`58`	`57`
`59`		`- /**`
`60`		`- * @param Node $node`
`61`		`- * @return array\|null`
`62`		`- */`
`63`		`- public function getServiceFromNode(Node $node)`
	`58`	`+ public function getServiceFromNode(Node $node): ?array`
`64`	`59`	`{`
`65`	`60`	`$serviceId = self::getServiceIdFromNode($node);`
`66`	`61`	`return $serviceId !== \null && \array_key_exists($serviceId, $this->services) ? $this->services[$serviceId] : \null;`
`67`	`62`	`}`
`68`	`63`
`69`		`- /**`
`70`		`- * @param Node $node`
`71`		`- * @return string\|null`
`72`		`- */`
`73`		`- public static function getServiceIdFromNode(Node $node)`
	`64`	`+ public static function getServiceIdFromNode(Node $node): ?string`
`74`	`65`	`{`
`75`	`66`	`if ($node instanceof String_) {`
`76`	`67`	`return $node->value;`