Update own code to PSR-12

mediact · Jun 11, 2020 · d79c84b · d79c84b
1 parent d34a187
commit d79c84b
Show file tree

Hide file tree

Showing 28 changed files with 100 additions and 21 deletions.
diff --git a/composer.json b/composer.json
@@ -9,7 +9,7 @@
             "email": "contact@mediact.nl"
         }
     ],
-    "version": "2.0.6",
+    "version": "2.1.0",
     "require": {
         "php": "^7.1",
         "composer-plugin-api": "^1.0"
@@ -18,7 +18,7 @@
         "phpunit/phpunit": "^7.5",
         "composer/composer": "^1.3",
         "kint-php/kint": "@stable",
-        "mediact/testing-suite": "^1.20",
+        "mediact/testing-suite": "^2.0",
         "mikey179/vfsstream": "^1.6"
     },
     "autoload": {
@@ -43,7 +43,8 @@
             "/phpmd.xml",
             "/phpstan.neon",
             "/phpcs.xml",
-            "/grumphp.yml"
+            "/grumphp.yml",
+            "/pdepend.xml"
         ]
     },
     "config": {

diff --git a/pdepend.xml b/pdepend.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0"?>
+<symfony:container xmlns:symfony="http://symfony.com/schema/dic/services"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns="http://pdepend.org/schema/dic/pdepend"
+    xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
+    <config>
+        <cache>
+            <driver>memory</driver>
+        </cache>
+    </config>
+</symfony:container>
diff --git a/src/Environment.php b/src/Environment.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * Copyright MediaCT. All rights reserved.
  * https://www.mediact.nl

diff --git a/src/EnvironmentInterface.php b/src/EnvironmentInterface.php
@@ -1,9 +1,12 @@
-<?php declare(strict_types=1);
+<?php
+
 /**
  * Copyright MediaCT. All rights reserved.
  * https://www.mediact.nl
  */
 
+declare(strict_types=1);
+
 namespace Mediact\CodingStandard\PhpStorm;
 
 use Composer\Composer;

diff --git a/src/Filesystem.php b/src/Filesystem.php
@@ -1,9 +1,12 @@
-<?php declare(strict_types=1);
+<?php
+
 /**
  * Copyright MediaCT. All rights reserved.
  * https://www.mediact.nl
  */
 
+declare(strict_types=1);
+
 namespace Mediact\CodingStandard\PhpStorm;
 
 use RecursiveDirectoryIterator;

diff --git a/src/FilesystemInterface.php b/src/FilesystemInterface.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * Copyright MediaCT. All rights reserved.
  * https://www.mediact.nl

diff --git a/src/InstallerPlugin.php b/src/InstallerPlugin.php
@@ -1,10 +1,13 @@
-<?php declare(strict_types=1);
+<?php
+
 /**
  * Copyright MediaCT. All rights reserved.
  * https://www.mediact.nl
  * @deprecated
  */
 
+declare(strict_types=1);
+
 namespace Mediact\CodingStandard\PhpStorm;
 
 use Composer\Composer;

diff --git a/src/Patcher/CodeStylePatcher.php b/src/Patcher/CodeStylePatcher.php
@@ -1,9 +1,12 @@
-<?php declare(strict_types=1);
+<?php
+
 /**
  * Copyright MediaCT. All rights reserved.
  * https://www.mediact.nl
  */
 
+declare(strict_types=1);
+
 namespace Mediact\CodingStandard\PhpStorm\Patcher;
 
 use Mediact\CodingStandard\PhpStorm\EnvironmentInterface;

diff --git a/src/Patcher/ConfigPatcher.php b/src/Patcher/ConfigPatcher.php
@@ -1,9 +1,12 @@
-<?php declare(strict_types=1);
+<?php
+
 /**
  * Copyright MediaCT. All rights reserved.
  * https://www.mediact.nl
  */
 
+declare(strict_types=1);
+
 namespace Mediact\CodingStandard\PhpStorm\Patcher;
 
 use Mediact\CodingStandard\PhpStorm\EnvironmentInterface;

diff --git a/src/Patcher/ConfigPatcherInterface.php b/src/Patcher/ConfigPatcherInterface.php
@@ -1,9 +1,12 @@
-<?php declare(strict_types=1);
+<?php
+
 /**
  * Copyright MediaCT. All rights reserved.
  * https://www.mediact.nl
  */
 
+declare(strict_types=1);
+
 namespace Mediact\CodingStandard\PhpStorm\Patcher;
 
 use Mediact\CodingStandard\PhpStorm\EnvironmentInterface;

diff --git a/src/Patcher/CopyFilesTrait.php b/src/Patcher/CopyFilesTrait.php
@@ -1,9 +1,12 @@
-<?php declare(strict_types=1);
+<?php
+
 /**
  * Copyright MediaCT. All rights reserved.
  * https://www.mediact.nl
  */
 
+declare(strict_types=1);
+
 namespace Mediact\CodingStandard\PhpStorm\Patcher;
 
 use Mediact\CodingStandard\PhpStorm\FilesystemInterface;

diff --git a/src/Patcher/FileTemplatesPatcher.php b/src/Patcher/FileTemplatesPatcher.php
@@ -1,9 +1,12 @@
-<?php declare(strict_types=1);
+<?php
+
 /**
  * Copyright MediaCT. All rights reserved.
  * https://www.mediact.nl
  */
 
+declare(strict_types=1);
+
 namespace Mediact\CodingStandard\PhpStorm\Patcher;
 
 use Mediact\CodingStandard\PhpStorm\EnvironmentInterface;

diff --git a/src/Patcher/InspectionsPatcher.php b/src/Patcher/InspectionsPatcher.php
@@ -1,9 +1,12 @@
-<?php declare(strict_types=1);
+<?php
+
 /**
  * Copyright MediaCT. All rights reserved.
  * https://www.mediact.nl
  */
 
+declare(strict_types=1);
+
 namespace Mediact\CodingStandard\PhpStorm\Patcher;
 
 use Mediact\CodingStandard\PhpStorm\EnvironmentInterface;
@@ -14,8 +17,8 @@ class InspectionsPatcher implements ConfigPatcherInterface
 {
     use CopyFilesTrait;
 
-    const PROJECT_PHPCS      = 'phpcs.xml';
-    const INSPECTION_PROFILE = 'inspectionProfiles/MediaCT.xml';
+    public const PROJECT_PHPCS      = 'phpcs.xml';
+    public const INSPECTION_PROFILE = 'inspectionProfiles/MediaCT.xml';
 
     /**
      * @var XmlAccessorInterface

diff --git a/src/Patcher/LiveTemplatesPatcher.php b/src/Patcher/LiveTemplatesPatcher.php
@@ -1,9 +1,12 @@
-<?php declare(strict_types=1);
+<?php
+
 /**
  * Copyright MediaCT. All rights reserved.
  * https://www.mediact.nl
  */
 
+declare(strict_types=1);
+
 namespace Mediact\CodingStandard\PhpStorm\Patcher;
 
 use Mediact\CodingStandard\PhpStorm\EnvironmentInterface;

diff --git a/src/Patcher/TemplateSettingsPatcher.php b/src/Patcher/TemplateSettingsPatcher.php
@@ -1,9 +1,12 @@
-<?php declare(strict_types=1);
+<?php
+
 /**
  * Copyright MediaCT. All rights reserved.
  * https://www.mediact.nl
  */
 
+declare(strict_types=1);
+
 namespace Mediact\CodingStandard\PhpStorm\Patcher;
 
 use Mediact\CodingStandard\PhpStorm\EnvironmentInterface;

diff --git a/src/Plugin.php b/src/Plugin.php
@@ -1,9 +1,12 @@
-<?php declare(strict_types=1);
+<?php
+
 /**
  * Copyright MediaCT. All rights reserved.
  * https://www.mediact.nl
  */
 
+declare(strict_types=1);
+
 namespace Mediact\CodingStandard\PhpStorm;
 
 use Composer\Composer;

diff --git a/src/XmlAccessor.php b/src/XmlAccessor.php
@@ -1,9 +1,12 @@
-<?php declare(strict_types=1);
+<?php
+
 /**
  * Copyright MediaCT. All rights reserved.
  * https://www.mediact.nl
  */
 
+declare(strict_types=1);
+
 namespace Mediact\CodingStandard\PhpStorm;
 
 use InvalidArgumentException;
@@ -52,7 +55,8 @@ public function getDescendant(
         array $path
     ): SimpleXMLElement {
         foreach ($path as $childProperties) {
-            if (!is_array($childProperties)
+            if (
+                !is_array($childProperties)
                 || empty($childProperties)
             ) {
                 throw new InvalidArgumentException('Invalid descendant path');

diff --git a/src/XmlAccessorInterface.php b/src/XmlAccessorInterface.php
@@ -1,9 +1,12 @@
-<?php declare(strict_types=1);
+<?php
+
 /**
  * Copyright MediaCT. All rights reserved.
  * https://www.mediact.nl
  */
 
+declare(strict_types=1);
+
 namespace Mediact\CodingStandard\PhpStorm;
 
 use InvalidArgumentException;

diff --git a/tests/EnvironmentTest.php b/tests/EnvironmentTest.php
@@ -1,8 +1,10 @@
 <?php
+
 /**
  * Copyright MediaCT. All rights reserved.
  * https://www.mediact.nl
  */
+
 namespace Mediact\CodingStandard\PhpStorm\Tests;
 
 use Composer\Composer;

diff --git a/tests/FilesystemTest.php b/tests/FilesystemTest.php
@@ -1,8 +1,10 @@
 <?php
+
 /**
  * Copyright MediaCT. All rights reserved.
  * https://www.mediact.nl
  */
+
 namespace Mediact\CodingStandard\PhpStorm\Tests;
 
 use org\bovigo\vfs\vfsStream;

diff --git a/tests/InstallerPluginTest.php b/tests/InstallerPluginTest.php
@@ -1,8 +1,12 @@
-<?php declare(strict_types=1);
+<?php
+
 /**
  * Copyright MediaCT. All rights reserved.
  * https://www.mediact.nl
  */
+
+declare(strict_types=1);
+
 namespace Mediact\CodingStandard\PhpStorm\Tests;
 
 use Composer\Composer;

diff --git a/tests/Patcher/CodeStylePatcherTest.php b/tests/Patcher/CodeStylePatcherTest.php
@@ -1,8 +1,10 @@
 <?php
+
 /**
  * Copyright MediaCT. All rights reserved.
  * https://www.mediact.nl
  */
+
 namespace Mediact\CodingStandard\PhpStorm\Tests\Patcher;
 
 use Mediact\CodingStandard\PhpStorm\EnvironmentInterface;

diff --git a/tests/Patcher/ConfigPatcherTest.php b/tests/Patcher/ConfigPatcherTest.php
@@ -1,8 +1,10 @@
 <?php
+
 /**
  * Copyright MediaCT. All rights reserved.
  * https://www.mediact.nl
  */
+
 namespace Mediact\CodingStandard\PhpStorm\Tests\Patcher;
 
 use Mediact\CodingStandard\PhpStorm\EnvironmentInterface;

diff --git a/tests/Patcher/CopyFilesTraitTest.php b/tests/Patcher/CopyFilesTraitTest.php
@@ -1,8 +1,10 @@
 <?php
+
 /**
  * Copyright MediaCT. All rights reserved.
  * https://www.mediact.nl
  */
+
 namespace Mediact\CodingStandard\PhpStorm\Tests\Patcher;
 
 use Mediact\CodingStandard\PhpStorm\EnvironmentInterface;

diff --git a/tests/Patcher/FileTemplatesPatcherTest.php b/tests/Patcher/FileTemplatesPatcherTest.php
@@ -1,8 +1,10 @@
 <?php
+
 /**
  * Copyright MediaCT. All rights reserved.
  * https://www.mediact.nl
  */
+
 namespace Mediact\CodingStandard\PhpStorm\Tests\Patcher;
 
 use Mediact\CodingStandard\PhpStorm\EnvironmentInterface;

diff --git a/tests/Patcher/InspectionsPatcherTest.php b/tests/Patcher/InspectionsPatcherTest.php
@@ -1,8 +1,10 @@
 <?php
+
 /**
  * Copyright MediaCT. All rights reserved.
  * https://www.mediact.nl
  */
+
 namespace Mediact\CodingStandard\PhpStorm\Tests\Patcher;
 
 use Mediact\CodingStandard\PhpStorm\EnvironmentInterface;

diff --git a/tests/Patcher/TestDouble/CopyFilesPatcherDouble.php b/tests/Patcher/TestDouble/CopyFilesPatcherDouble.php
@@ -1,8 +1,10 @@
 <?php
+
 /**
  * Copyright MediaCT. All rights reserved.
  * https://www.mediact.nl
  */
+
 namespace Mediact\CodingStandard\PhpStorm\Tests\Patcher\TestDouble;
 
 use Mediact\CodingStandard\PhpStorm\EnvironmentInterface;

diff --git a/tests/XmlAccessorTest.php b/tests/XmlAccessorTest.php
@@ -1,8 +1,10 @@
 <?php
+
 /**
  * Copyright MediaCT. All rights reserved.
  * https://www.mediact.nl
  */
+
 namespace Mediact\CodingStandard\PhpStorm\Tests;
 
 use PHPUnit\Framework\TestCase;