Merge pull request #17 from mediact/feature/MG-973

2.1.0 Update file templates to comply to PSR-12

Author: ashokadewit

composer.json

@@ -9,7 +9,7 @@
             "email": "[email protected]"
         }
     ],
-    "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": {

files/fileTemplates/M2-Class-Backend-Controller.php

@@ -1,6 +1,9 @@
-<?php declare(strict_types=1);
+<?php
+
 #parse("M2-PHP-File-Header")
 
+declare(strict_types=1);
+
 #if (${NAMESPACE})
 namespace ${NAMESPACE};
 #end

files/fileTemplates/M2-Class-Block.php

@@ -1,6 +1,9 @@
-<?php declare(strict_types=1);
+<?php
+
 #parse("M2-PHP-File-Header")
 
+declare(strict_types=1);
+
 #if (${NAMESPACE})
 namespace ${NAMESPACE};
 #end

files/fileTemplates/M2-Class-Helper.php

@@ -1,6 +1,9 @@
-<?php declare(strict_types=1);
+<?php
+
 #parse("M2-PHP-File-Header")
 
+declare(strict_types=1);
+
 #if (${NAMESPACE})
 namespace ${NAMESPACE};
 #end

files/fileTemplates/M2-Class-Observer.php

@@ -1,6 +1,9 @@
-<?php declare(strict_types=1);
+<?php
+
 #parse("M2-PHP-File-Header")
 
+declare(strict_types=1);
+
 #if (${NAMESPACE})
 namespace ${NAMESPACE};
 #end

files/fileTemplates/M2-Class-ViewModel.php

@@ -1,6 +1,9 @@
-<?php declare(strict_types=1);
+<?php
+
 #parse("M2-PHP-File-Header")
 
+declare(strict_types=1);
+
 #if (${NAMESPACE})
 namespace ${NAMESPACE};
 #end

files/fileTemplates/M2-Class.php

@@ -1,6 +1,9 @@
-<?php declare(strict_types=1);
+<?php
+
 #parse("M2-PHP-File-Header")
 
+declare(strict_types=1);
+
 #if (${NAMESPACE})
 namespace ${NAMESPACE};
 #end

files/fileTemplates/M2-Registration.php

@@ -1,6 +1,9 @@
-<?php declare(strict_types=1);
+<?php
+
 #parse("M2-PHP-File-Header")
 
+declare(strict_types=1);
+
 use Magento\Framework\Component\ComponentRegistrar;
 
 ComponentRegistrar::register(

files/fileTemplates/includes/Company Settings.php

@@ -0,0 +1,3 @@
+#set( $Company = "MediaCT" )
+#set( $Vendor = "MediaCT" )
+#set( $Website = "https://www.mediact.nl")

files/fileTemplates/includes/PHP File Header.php

@@ -1,4 +1,5 @@
+#parse("Company Settings")
 /**
- * Copyright MediaCT. All rights reserved.
- * https://www.mediact.nl
- */
+* Copyright $Company. All rights reserved.
+* $Website
+*/

files/fileTemplates/internal/PHP Class.php

@@ -1,6 +1,6 @@
 <?php
-#parse("PHP File Header")
 
+#parse("PHP File Header")
 
 declare(strict_types=1);
 

files/fileTemplates/internal/PHP File.php

@@ -1,5 +1,5 @@
 <?php
-#parse("PHP File Header")
 
+#parse("PHP File Header")
 
 declare(strict_types=1);

files/fileTemplates/internal/PHP Interface.php

@@ -1,6 +1,6 @@
 <?php
-#parse("PHP File Header")
 
+#parse("PHP File Header")
 
 declare(strict_types=1);
 

files/fileTemplates/internal/PHP Trait.php

@@ -1,6 +1,6 @@
 <?php
-#parse("PHP File Header")
 
+#parse("PHP File Header")
 
 declare(strict_types=1);
 

files/fileTemplates/internal/PHPUnit 6 Test.php

@@ -1 +1,19 @@
-PHPUnit Test.php
+<?php
+
+#parse("PHP File Header")
+
+declare(strict_types=1);
+
+#if (${NAMESPACE})
+namespace ${NAMESPACE};
+#end
+
+use PHPUnit\Framework\TestCase;
+use ${TESTED_NAMESPACE}\\${TESTED_NAME};
+
+/**
+ * @coversDefaultClass \\${TESTED_NAMESPACE}\\${TESTED_NAME}
+ */
+class ${NAME} extends TestCase
+{
+}

files/fileTemplates/internal/PHPUnit Test.php

@@ -1,6 +1,6 @@
 <?php
-#parse("PHP File Header")
 
+#parse("PHP File Header")
 
 declare(strict_types=1);
 

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>

src/Environment.php

@@ -1,4 +1,5 @@
 <?php
+
 /**
  * Copyright MediaCT. All rights reserved.
  * https://www.mediact.nl

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;

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;

src/FilesystemInterface.php

@@ -1,4 +1,5 @@
 <?php
+
 /**
  * Copyright MediaCT. All rights reserved.
  * https://www.mediact.nl

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;

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;

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;

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;

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;

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;

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

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;

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;

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;