Merge pull request #125 from nerds-and-company/phpcs_fixes

PHPCS fixes
nerds-and-company · Apr 24, 2018 · 9d06950 · 9d06950
2 parents a75fe8d + 11b20c7
commit 9d06950
Show file tree

Hide file tree

Showing 37 changed files with 99 additions and 19 deletions.
diff --git a/phpcs.xml.dist b/phpcs.xml.dist
@@ -3,6 +3,7 @@
  <description>Coding standard for schematic</description>
 
  <file>src/</file>
+ <file>tests/</file>
 
  <arg name="colors"/>
  <arg name="extensions" value="php"/>

diff --git a/src/Converters/Fields/Matrix.php b/src/Converters/Fields/Matrix.php
@@ -40,7 +40,11 @@ public function saveRecord(Model $record, array $definition): bool
 
         if (parent::saveRecord($record, $definition)) {
             if (array_key_exists('blockTypes', $definition)) {
-                Craft::$app->controller->module->modelMapper->import($definition['blockTypes'], $record->getBlockTypes(), ['fieldId' => $record->id]);
+                Craft::$app->controller->module->modelMapper->import(
+                    $definition['blockTypes'],
+                    $record->getBlockTypes(),
+                    ['fieldId' => $record->id]
+                );
             }
 
             return true;

diff --git a/src/Converters/Models/Section.php b/src/Converters/Models/Section.php
@@ -45,7 +45,11 @@ public function getRecordDefinition(Model $record): array
     public function saveRecord(Model $record, array $definition): bool
     {
         if (Craft::$app->sections->saveSection($record)) {
-            Craft::$app->controller->module->modelMapper->import($definition['entryTypes'], $record->getEntryTypes(), ['sectionId' => $record->id]);
+            Craft::$app->controller->module->modelMapper->import(
+                $definition['entryTypes'],
+                $record->getEntryTypes(),
+                ['sectionId' => $record->id]
+            );
 
             return true;
         }

diff --git a/tests/_support/Helper/Unit.php b/tests/_support/Helper/Unit.php
@@ -38,6 +38,7 @@ class Unit extends Module
      * Mock craft Mappers.
      *
      * @SuppressWarnings(PHPMD.CamelCaseMethodName)
+     * phpcs:disable PSR2.Methods.MethodDeclaration.Underscore
      *
      * @param TestCase $test
      */

diff --git a/tests/_support/UnitTester.php b/tests/_support/UnitTester.php
@@ -16,6 +16,7 @@
  * @method \Codeception\Lib\Friend haveFriend($name, $actorClass = NULL)
  *
  * @SuppressWarnings(PHPMD)
+ * phpcs:disable PSR1.Classes.ClassDeclaration.MissingNamespace
  */
 class UnitTester extends \Codeception\Actor
 {

diff --git a/tests/unit/Converters/Base/FieldTest.php b/tests/unit/Converters/Base/FieldTest.php
@@ -26,6 +26,7 @@ class FieldTest extends Unit
      * Set the converter.
      *
      * @SuppressWarnings(PHPMD.CamelCaseMethodName)
+     * phpcs:disable PSR2.Methods.MethodDeclaration.Underscore
      */
     protected function _before()
     {
@@ -185,7 +186,7 @@ private function getMockFieldGroup(int $groupId)
     {
         $mockGroup = $this->getMockBuilder(FieldGroup::class)
                         ->disableOriginalConstructor()
-                        ->getmock();
+                        ->getMock();
 
         $mockGroup->id = $groupId;
         $mockGroup->name = 'fieldGroup'.$groupId;

diff --git a/tests/unit/Converters/Base/VolumeTest.php b/tests/unit/Converters/Base/VolumeTest.php
@@ -29,6 +29,7 @@ class VolumeTest extends Unit
      * Set the converter.
      *
      * @SuppressWarnings(PHPMD.CamelCaseMethodName)
+     * phpcs:disable PSR2.Methods.MethodDeclaration.Underscore
      */
     protected function _before()
     {

diff --git a/tests/unit/Converters/Elements/GlobalSetTest.php b/tests/unit/Converters/Elements/GlobalSetTest.php
@@ -31,6 +31,7 @@ class GlobalSetsTest extends Unit
      * Set the converter.
      *
      * @SuppressWarnings(PHPMD.CamelCaseMethodName)
+     * phpcs:disable PSR2.Methods.MethodDeclaration.Underscore
      */
     protected function _before()
     {
@@ -164,7 +165,14 @@ private function getMockGlobalSetDefinition(GlobalSetElement $mockGlobalSet)
     private function getMockGlobalSet(int $setId, string $siteHandle = 'default')
     {
         $mockSet = $this->getMockBuilder(GlobalSetElement::class)
-                                    ->setMethods(['__isset', 'getSite', 'getFieldLayout', 'fieldByHandle', 'getBehavior', 'behaviors'])
+                                    ->setMethods([
+                                        '__isset',
+                                        'getSite',
+                                        'getFieldLayout',
+                                        'fieldByHandle',
+                                        'getBehavior',
+                                        'behaviors',
+                                    ])
                                     ->disableOriginalConstructor()
                                     ->getMock();
 

diff --git a/tests/unit/Converters/Fields/AssetsTest.php b/tests/unit/Converters/Fields/AssetsTest.php
@@ -27,6 +27,7 @@ class AssetsTest extends Unit
      * Set the converter.
      *
      * @SuppressWarnings(PHPMD.CamelCaseMethodName)
+     * phpcs:disable PSR2.Methods.MethodDeclaration.Underscore
      */
     protected function _before()
     {

diff --git a/tests/unit/Converters/Fields/MatrixTest.php b/tests/unit/Converters/Fields/MatrixTest.php
@@ -26,6 +26,7 @@ class MatrixTest extends Unit
      * Set the converter.
      *
      * @SuppressWarnings(PHPMD.CamelCaseMethodName)
+     * phpcs:disable PSR2.Methods.MethodDeclaration.Underscore
      */
     protected function _before()
     {
@@ -70,7 +71,9 @@ public function testSaveRecord(MatrixField $matrix, array $definition, bool $val
 
         Craft::$app->controller->module->modelMapper->expects($this->exactly($valid ? 1 : 0))
                                      ->method('import')
-                                     ->with($definition['blockTypes'], $matrix->getBlockTypes(), ['fieldId' => $matrix->id])
+                                     ->with($definition['blockTypes'], $matrix->getBlockTypes(), [
+                                         'fieldId' => $matrix->id,
+                                     ])
                                      ->willReturn($matrix->getBlockTypes());
 
         $result = $this->converter->saveRecord($matrix, $definition);

diff --git a/tests/unit/Converters/Models/AssetTransformTest.php b/tests/unit/Converters/Models/AssetTransformTest.php
@@ -26,6 +26,7 @@ class AssetTransformTest extends Unit
      * Set the converter.
      *
      * @SuppressWarnings(PHPMD.CamelCaseMethodName)
+     * phpcs:disable PSR2.Methods.MethodDeclaration.Underscore
      */
     protected function _before()
     {

diff --git a/tests/unit/Converters/Models/CategoryGroupTest.php b/tests/unit/Converters/Models/CategoryGroupTest.php
@@ -29,6 +29,7 @@ class CategoryGroupTest extends Unit
      * Set the converter.
      *
      * @SuppressWarnings(PHPMD.CamelCaseMethodName)
+     * phpcs:disable PSR2.Methods.MethodDeclaration.Underscore
      */
     protected function _before()
     {

diff --git a/tests/unit/Converters/Models/EntryTypeTest.php b/tests/unit/Converters/Models/EntryTypeTest.php
@@ -29,6 +29,7 @@ class EntryTypeTest extends Unit
      * Set the converter.
      *
      * @SuppressWarnings(PHPMD.CamelCaseMethodName)
+     * phpcs:disable PSR2.Methods.MethodDeclaration.Underscore
      */
     protected function _before()
     {

diff --git a/tests/unit/Converters/Models/MatrixBlockTypeTest.php b/tests/unit/Converters/Models/MatrixBlockTypeTest.php
@@ -28,6 +28,7 @@ class MatrixBlockTypeTest extends Unit
      * Set the converter.
      *
      * @SuppressWarnings(PHPMD.CamelCaseMethodName)
+     * phpcs:disable PSR2.Methods.MethodDeclaration.Underscore
      */
     protected function _before()
     {
@@ -63,8 +64,11 @@ public function testGetRecordDefinition(MatrixBlockTypeModel $blockType, array $
      * @param array                $definition
      * @param array                $defaultAttributes
      */
-    public function testSetRecordAttributes(MatrixBlockTypeModel $blockType, array $definition, array $defaultAttributes)
-    {
+    public function testSetRecordAttributes(
+        MatrixBlockTypeModel $blockType,
+        array $definition,
+        array $defaultAttributes
+    ) {
         $newMatrixBlockType = $this->getMockBuilder(MatrixBlockTypeModel::class)
                                    ->setMethods(['setFieldLayout'])
                                    ->getMock();

diff --git a/tests/unit/Converters/Models/SectionTest.php b/tests/unit/Converters/Models/SectionTest.php
@@ -28,6 +28,7 @@ class SectionTest extends Unit
      * Set the converter.
      *
      * @SuppressWarnings(PHPMD.CamelCaseMethodName)
+     * phpcs:disable PSR2.Methods.MethodDeclaration.Underscore
      */
     protected function _before()
     {
@@ -72,7 +73,9 @@ public function testSaveRecord(SectionModel $section, array $definition, bool $v
 
         Craft::$app->controller->module->modelMapper->expects($this->exactly($valid ? 1 : 0))
                                      ->method('import')
-                                     ->with($definition['entryTypes'], $section->getEntryTypes(), ['sectionId' => $section->id])
+                                     ->with($definition['entryTypes'], $section->getEntryTypes(), [
+                                         'sectionId' => $section->id,
+                                     ])
                                      ->willReturn($section->getEntryTypes());
 
         $result = $this->converter->saveRecord($section, $definition);

diff --git a/tests/unit/Converters/Models/SiteTest.php b/tests/unit/Converters/Models/SiteTest.php
@@ -27,6 +27,7 @@ class SiteTest extends Unit
      * Set the converter.
      *
      * @SuppressWarnings(PHPMD.CamelCaseMethodName)
+     * phpcs:disable PSR2.Methods.MethodDeclaration.Underscore
      */
     protected function _before()
     {

diff --git a/tests/unit/Converters/Models/TagGroupTest.php b/tests/unit/Converters/Models/TagGroupTest.php
@@ -26,6 +26,7 @@ class TagGroupTest extends Unit
      * Set the converter.
      *
      * @SuppressWarnings(PHPMD.CamelCaseMethodName)
+     * phpcs:disable PSR2.Methods.MethodDeclaration.Underscore
      */
     protected function _before()
     {

diff --git a/tests/unit/Converters/Models/UserGroupTest.php b/tests/unit/Converters/Models/UserGroupTest.php
@@ -30,6 +30,7 @@ class UserGroupTest extends Unit
      * Set the converter.
      *
      * @SuppressWarnings(PHPMD.CamelCaseMethodName)
+     * phpcs:disable PSR2.Methods.MethodDeclaration.Underscore
      */
     protected function _before()
     {
@@ -48,8 +49,12 @@ protected function _before()
      * @param array          $groupPermissions
      * @param array          $allPermissions
      */
-    public function testGetRecordDefinition(UserGroupModel $group, array $definition, array $groupPermissions, array $allPermissions)
-    {
+    public function testGetRecordDefinition(
+        UserGroupModel $group,
+        array $definition,
+        array $groupPermissions,
+        array $allPermissions
+    ) {
         Craft::$app->userPermissions->expects($this->exactly(1))
                                     ->method('getPermissionsByGroupId')
                                     ->with($group->id)
@@ -90,8 +95,13 @@ public function testGetRecordDefinition(UserGroupModel $group, array $definition
      * @param array          $allPermissions
      * @param bool           $valid
      */
-    public function testSaveRecord(UserGroupModel $group, array $definition, array $groupPermissions, array $allPermissions, bool $valid)
-    {
+    public function testSaveRecord(
+        UserGroupModel $group,
+        array $definition,
+        array $groupPermissions,
+        array $allPermissions,
+        bool $valid
+    ) {
         Craft::$app->userGroups->expects($this->exactly(1))
                                ->method('saveGroup')
                                ->with($group)

diff --git a/tests/unit/DataTypes/AssetTransformDataTypeTest.php b/tests/unit/DataTypes/AssetTransformDataTypeTest.php
@@ -26,6 +26,7 @@ class AssetTransformDataTypeTest extends Unit
      * Set the dataType.
      *
      * @SuppressWarnings(PHPMD.CamelCaseMethodName)
+     * phpcs:disable PSR2.Methods.MethodDeclaration.Underscore
      */
     protected function _before()
     {

diff --git a/tests/unit/DataTypes/CategoryGroupDataTypeTest.php b/tests/unit/DataTypes/CategoryGroupDataTypeTest.php
@@ -26,6 +26,7 @@ class CategoryGroupDataTypeTest extends Unit
      * Set the dataType.
      *
      * @SuppressWarnings(PHPMD.CamelCaseMethodName)
+     * phpcs:disable PSR2.Methods.MethodDeclaration.Underscore
      */
     protected function _before()
     {

diff --git a/tests/unit/DataTypes/ElementIndexDataTypeTest.php b/tests/unit/DataTypes/ElementIndexDataTypeTest.php
@@ -26,6 +26,7 @@ class ElementIndexDataTypeTest extends Unit
      * Set the dataType.
      *
      * @SuppressWarnings(PHPMD.CamelCaseMethodName)
+     * phpcs:disable PSR2.Methods.MethodDeclaration.Underscore
      */
     protected function _before()
     {

diff --git a/tests/unit/DataTypes/EmailSettingsDataTypeTest.php b/tests/unit/DataTypes/EmailSettingsDataTypeTest.php
@@ -24,6 +24,7 @@ class EmailSettingsDataTypeTest extends Unit
      * Set the dataType.
      *
      * @SuppressWarnings(PHPMD.CamelCaseMethodName)
+     * phpcs:disable PSR2.Methods.MethodDeclaration.Underscore
      */
     protected function _before()
     {

diff --git a/tests/unit/DataTypes/FieldDataTypeTest.php b/tests/unit/DataTypes/FieldDataTypeTest.php
@@ -26,6 +26,7 @@ class FieldDataTypeTest extends Unit
      * Set the dataType.
      *
      * @SuppressWarnings(PHPMD.CamelCaseMethodName)
+     * phpcs:disable PSR2.Methods.MethodDeclaration.Underscore
      */
     protected function _before()
     {

diff --git a/tests/unit/DataTypes/GlobalSetDataTypeTest.php b/tests/unit/DataTypes/GlobalSetDataTypeTest.php
@@ -26,6 +26,7 @@ class GlobalSetDataTypeTest extends Unit
      * Set the dataType.
      *
      * @SuppressWarnings(PHPMD.CamelCaseMethodName)
+     * phpcs:disable PSR2.Methods.MethodDeclaration.Underscore
      */
     protected function _before()
     {

diff --git a/tests/unit/DataTypes/PluginDataTypeTest.php b/tests/unit/DataTypes/PluginDataTypeTest.php
@@ -25,6 +25,7 @@ class PluginDataTypeTest extends Unit
      * Set the dataType.
      *
      * @SuppressWarnings(PHPMD.CamelCaseMethodName)
+     * phpcs:disable PSR2.Methods.MethodDeclaration.Underscore
      */
     protected function _before()
     {

diff --git a/tests/unit/DataTypes/SectionDataTypeTest.php b/tests/unit/DataTypes/SectionDataTypeTest.php
@@ -26,6 +26,7 @@ class SectionDataTypeTest extends Unit
      * Set the dataType.
      *
      * @SuppressWarnings(PHPMD.CamelCaseMethodName)
+     * phpcs:disable PSR2.Methods.MethodDeclaration.Underscore
      */
     protected function _before()
     {

diff --git a/tests/unit/DataTypes/SiteDataTypeTest.php b/tests/unit/DataTypes/SiteDataTypeTest.php
@@ -26,6 +26,7 @@ class SiteDataTypeTest extends Unit
      * Set the dataType.
      *
      * @SuppressWarnings(PHPMD.CamelCaseMethodName)
+     * phpcs:disable PSR2.Methods.MethodDeclaration.Underscore
      */
     protected function _before()
     {

diff --git a/tests/unit/DataTypes/TagGroupDataTypeTest.php b/tests/unit/DataTypes/TagGroupDataTypeTest.php
@@ -26,6 +26,7 @@ class TagGroupDataTypeTest extends Unit
      * Set the dataType.
      *
      * @SuppressWarnings(PHPMD.CamelCaseMethodName)
+     * phpcs:disable PSR2.Methods.MethodDeclaration.Underscore
      */
     protected function _before()
     {

diff --git a/tests/unit/DataTypes/UserGroupDataTypeTest.php b/tests/unit/DataTypes/UserGroupDataTypeTest.php
@@ -26,6 +26,7 @@ class UserGroupDataTypeTest extends Unit
      * Set the dataType.
      *
      * @SuppressWarnings(PHPMD.CamelCaseMethodName)
+     * phpcs:disable PSR2.Methods.MethodDeclaration.Underscore
      */
     protected function _before()
     {

diff --git a/tests/unit/DataTypes/UserSettingsDataTypeTest.php b/tests/unit/DataTypes/UserSettingsDataTypeTest.php
@@ -24,6 +24,7 @@ class UserSettingsDataTypeTest extends Unit
      * Set the dataType.
      *
      * @SuppressWarnings(PHPMD.CamelCaseMethodName)
+     * phpcs:disable PSR2.Methods.MethodDeclaration.Underscore
      */
     protected function _before()
     {

diff --git a/tests/unit/DataTypes/VolumeDataTypeTest.php b/tests/unit/DataTypes/VolumeDataTypeTest.php
@@ -26,6 +26,7 @@ class VolumeDataTypeTest extends Unit
      * Set the dataType.
      *
      * @SuppressWarnings(PHPMD.CamelCaseMethodName)
+     * phpcs:disable PSR2.Methods.MethodDeclaration.Underscore
      */
     protected function _before()
     {

diff --git a/tests/unit/Mappers/ElementIndexMapperTest.php b/tests/unit/Mappers/ElementIndexMapperTest.php
@@ -28,6 +28,7 @@ class ElementIndexMapperTest extends Unit
      * Set the mapper.
      *
      * @SuppressWarnings(PHPMD.CamelCaseMethodName)
+     * phpcs:disable PSR2.Methods.MethodDeclaration.Underscore
      */
     protected function _before()
     {

diff --git a/tests/unit/Mappers/EmailSettingsMapperTest.php b/tests/unit/Mappers/EmailSettingsMapperTest.php
@@ -25,6 +25,7 @@ class EmailSettingsMapperTest extends Unit
      * Set the mapper.
      *
      * @SuppressWarnings(PHPMD.CamelCaseMethodName)
+     * phpcs:disable PSR2.Methods.MethodDeclaration.Underscore
      */
     protected function _before()
     {