Fixed coding standard violations in the Framework\Data namespace, so that it will be checked bij PHP CS and no longer be ignored while doing CI checks. Made the following changes:

dverkade · dverkade · commit 2f7131c15d6a · 2017-04-20T17:43:59.000+02:00
- Removed @codingStandardsIgnoreFile at the head of the files
- Fixed indentation
- Changed is_null function call to a === null compare
diff --git a/lib/internal/Magento/Framework/Data/Form/Element/Editor.php b/lib/internal/Magento/Framework/Data/Form/Element/Editor.php
@@ -4,8 +4,6 @@
  * See COPYING.txt for license details.
  */
 
-// @codingStandardsIgnoreFile
-
 namespace Magento\Framework\Data\Form\Element;
 
 use Magento\Framework\Escaper;
@@ -123,7 +121,15 @@ public function getElementHtml()
                 '
                 <script type="text/javascript">
                 //<![CDATA[
-                window.tinyMCE_GZ = window.tinyMCE_GZ || {}; window.tinyMCE_GZ.loaded = true;require(["jquery", "mage/translate", "mage/adminhtml/events", "mage/adminhtml/wysiwyg/tiny_mce/setup", "mage/adminhtml/wysiwyg/widget"], function(jQuery){' .
+                window.tinyMCE_GZ = window.tinyMCE_GZ || {}; 
+                window.tinyMCE_GZ.loaded = true;
+                require([
+                "jquery", 
+                "mage/translate", 
+                "mage/adminhtml/events", 
+                "mage/adminhtml/wysiwyg/tiny_mce/setup", 
+                "mage/adminhtml/wysiwyg/widget"
+                ], function(jQuery){' .
                 "\n" .
                 '  (function($) {$.mage.translate.add(' .
                 \Zend_Json::encode(
@@ -255,8 +261,8 @@ protected function _getPluginButtonsHtml($visible = true)
                 [
                     'title' => $this->translate('Insert Widget...'),
                     'onclick' => "widgetTools.openDialog('" . $this->getConfig(
-                        'widget_window_url'
-                    ) . "widget_target_id/" . $this->getHtmlId() . "')",
+                            'widget_window_url'
+                        ) . "widget_target_id/" . $this->getHtmlId() . "')",
                     'class' => 'action-add-widget plugin',
                     'style' => $visible ? '' : 'display:none',
                 ]
@@ -269,12 +275,12 @@ protected function _getPluginButtonsHtml($visible = true)
                 [
                     'title' => $this->translate('Insert Image...'),
                     'onclick' => "MediabrowserUtility.openDialog('" . $this->getConfig(
-                        'files_browser_window_url'
-                    ) . "target_element_id/" . $this->getHtmlId() . "/" . (null !== $this->getConfig(
-                        'store_id'
-                    ) ? 'store/' . $this->getConfig(
-                        'store_id'
-                    ) . '/' : '') . "')",
+                            'files_browser_window_url'
+                        ) . "target_element_id/" . $this->getHtmlId() . "/" . (null !== $this->getConfig(
+                            'store_id'
+                        ) ? 'store/' . $this->getConfig(
+                                'store_id'
+                            ) . '/' : '') . "')",
                     'class' => 'action-add-image plugin',
                     'style' => $visible ? '' : 'display:none',
                 ]
@@ -390,12 +396,12 @@ protected function _wrapIntoContainer($html)
         }
 
         $html = '<div id="editor' . $this->getHtmlId() . '"' . ($this->getConfig(
-            'no_display'
-        ) ? ' style="display:none;"' : '') . ($this->getConfig(
-            'container_class'
-        ) ? ' class="admin__control-wysiwig ' . $this->getConfig(
-            'container_class'
-        ) . '"' : '') . '>' . $html . '</div>';
+                'no_display'
+            ) ? ' style="display:none;"' : '') . ($this->getConfig(
+                'container_class'
+            ) ? ' class="admin__control-wysiwig ' . $this->getConfig(
+                    'container_class'
+                ) . '"' : '') . '>' . $html . '</div>';
 
         return $html;
     }
diff --git a/lib/internal/Magento/Framework/Data/Form/Element/Gallery.php b/lib/internal/Magento/Framework/Data/Form/Element/Gallery.php
@@ -4,8 +4,6 @@
  * See COPYING.txt for license details.
  */
 
-// @codingStandardsIgnoreFile
-
 /**
  * Category form input image element
  *
@@ -43,10 +41,18 @@ public function getElementHtml()
         $gallery = $this->getValue();
 
         $html = '<table id="gallery" class="gallery" border="0" cellspacing="3" cellpadding="0">';
-        $html .= '<thead id="gallery_thead" class="gallery"><tr class="gallery"><td class="gallery" valign="middle" align="center">Big Image</td><td class="gallery" valign="middle" align="center">Thumbnail</td><td class="gallery" valign="middle" align="center">Small Thumb</td><td class="gallery" valign="middle" align="center">Sort Order</td><td class="gallery" valign="middle" align="center">Delete</td></tr></thead>';
+        $html .= '<thead id="gallery_thead" class="gallery">' .
+            '<tr class="gallery">' .
+            '<td class="gallery" valign="middle" align="center">Big Image</td>' .
+            '<td class="gallery" valign="middle" align="center">Thumbnail</td>' .
+            '<td class="gallery" valign="middle" align="center">Small Thumb</td>' .
+            '<td class="gallery" valign="middle" align="center">Sort Order</td>' .
+            '<td class="gallery" valign="middle" align="center">Delete</td>' .
+            '</tr>'.
+            '</thead>';
         $widgetButton = $this->getForm()->getParent()->getLayout();
         $buttonHtml = $widgetButton->createBlock(
-             \Magento\Backend\Block\Widget\Button::class
+            \Magento\Backend\Block\Widget\Button::class
         )->setData(
             ['label' => 'Add New Image', 'onclick' => 'addNewImg()', 'class' => 'add']
         )->toHtml();
@@ -60,7 +66,7 @@ public function getElementHtml()
         $html .= '<tbody class="gallery">';
 
         $i = 0;
-        if (!is_null($this->getValue())) {
+        if ($this->getValue() !== null) {
             foreach ($this->getValue() as $image) {
                 $i++;
                 $html .= '<tr class="gallery">';
@@ -102,7 +108,8 @@ public function getElementHtml()
                             'file'
                         ) . ' ></td>';
                 }
-                $html .= '<td class="gallery" align="center" style="vertical-align:bottom;"><input type="input" name="' .
+                $html .= '<td class="gallery" align="center" style="vertical-align:bottom;">' .
+                    '<input type="input" name="' .
                     parent::getName() .
                     '[position][' .
                     $image->getValueId() .
@@ -116,7 +123,8 @@ public function getElementHtml()
                     $this->_getUiId(
                         'position-' . $image->getValueId()
                     ) . '/></td>';
-                $html .= '<td class="gallery" align="center" style="vertical-align:bottom;"><input type="checkbox" name="' .
+                $html .= '<td class="gallery" align="center" style="vertical-align:bottom;">' .
+                    '<input type="checkbox" name="' .
                     parent::getName() .
                     '[delete][' .
                     $image->getValueId() .
@@ -134,7 +142,9 @@ public function getElementHtml()
             }
         }
         if ($i == 0) {
-            $html .= '<script type="text/javascript">document.getElementById("gallery_thead").style.visibility="hidden";</script>';
+            $html .= '<script type="text/javascript">' .
+                'document.getElementById("gallery_thead").style.visibility="hidden";' .
+                '</script>';
         }
 
         $html .= '</tbody></table>';
diff --git a/lib/internal/Magento/Framework/Data/Form/Element/Time.php b/lib/internal/Magento/Framework/Data/Form/Element/Time.php
@@ -4,8 +4,6 @@
  * See COPYING.txt for license details.
  */
 
-// @codingStandardsIgnoreFile
-
 /**
  * Form time element
  *
@@ -54,52 +52,52 @@ public function getElementHtml()
     {
         $this->addClass('select admin__control-select');
 
-        $value_hrs = 0;
-        $value_min = 0;
-        $value_sec = 0;
+        $valueHrs = 0;
+        $valueMin = 0;
+        $valueSec = 0;
 
         if ($value = $this->getValue()) {
             $values = explode(',', $value);
             if (is_array($values) && count($values) == 3) {
-                $value_hrs = $values[0];
-                $value_min = $values[1];
-                $value_sec = $values[2];
+                $valueHrs = $values[0];
+                $valueMin = $values[1];
+                $valueSec = $values[2];
             }
         }
 
         $html = '<input type="hidden" id="' . $this->getHtmlId() . '" ' . $this->_getUiId() . '/>';
         $html .= '<select name="' . $this->getName() . '" style="width:80px" ' . $this->serialize(
-            $this->getHtmlAttributes()
-        ) . $this->_getUiId(
-            'hour'
-        ) . '>' . "\n";
+                $this->getHtmlAttributes()
+            ) . $this->_getUiId(
+                'hour'
+            ) . '>' . "\n";
         for ($i = 0; $i < 24; $i++) {
             $hour = str_pad($i, 2, '0', STR_PAD_LEFT);
-            $html .= '<option value="' . $hour . '" ' . ($value_hrs ==
+            $html .= '<option value="' . $hour . '" ' . ($valueHrs ==
                 $i ? 'selected="selected"' : '') . '>' . $hour . '</option>';
         }
         $html .= '</select>' . "\n";
 
         $html .= ':&nbsp;<select name="' . $this->getName() . '" style="width:80px" ' . $this->serialize(
-            $this->getHtmlAttributes()
-        ) . $this->_getUiId(
-            'minute'
-        ) . '>' . "\n";
+                $this->getHtmlAttributes()
+            ) . $this->_getUiId(
+                'minute'
+            ) . '>' . "\n";
         for ($i = 0; $i < 60; $i++) {
             $hour = str_pad($i, 2, '0', STR_PAD_LEFT);
-            $html .= '<option value="' . $hour . '" ' . ($value_min ==
+            $html .= '<option value="' . $hour . '" ' . ($valueMin ==
                 $i ? 'selected="selected"' : '') . '>' . $hour . '</option>';
         }
         $html .= '</select>' . "\n";
 
         $html .= ':&nbsp;<select name="' . $this->getName() . '" style="width:80px" ' . $this->serialize(
-            $this->getHtmlAttributes()
-        ) . $this->_getUiId(
-            'second'
-        ) . '>' . "\n";
+                $this->getHtmlAttributes()
+            ) . $this->_getUiId(
+                'second'
+            ) . '>' . "\n";
         for ($i = 0; $i < 60; $i++) {
             $hour = str_pad($i, 2, '0', STR_PAD_LEFT);
-            $html .= '<option value="' . $hour . '" ' . ($value_sec ==
+            $html .= '<option value="' . $hour . '" ' . ($valueSec ==
                 $i ? 'selected="selected"' : '') . '>' . $hour . '</option>';
         }
         $html .= '</select>' . "\n";
diff --git a/lib/internal/Magento/Framework/Data/FormFactory.php b/lib/internal/Magento/Framework/Data/FormFactory.php
@@ -4,8 +4,6 @@
  * See COPYING.txt for license details.
  */
 
-// @codingStandardsIgnoreFile
-
 namespace Magento\Framework\Data;
 
 /**
@@ -54,7 +52,10 @@ public function create(array $data = [])
         $form = $this->_objectManager->create($this->_instanceName, $data);
         if (!$form instanceof \Magento\Framework\Data\Form) {
             throw new \Magento\Framework\Exception\LocalizedException(
-                new \Magento\Framework\Phrase('%1 doesn\'t extend \Magento\Framework\Data\Form', [$this->_instanceName])
+                new \Magento\Framework\Phrase(
+                    '%1 doesn\'t extend \Magento\Framework\Data\Form',
+                    [$this->_instanceName]
+                )
             );
         }
         return $form;
diff --git a/lib/internal/Magento/Framework/Data/Test/Unit/Collection/DbTest.php b/lib/internal/Magento/Framework/Data/Test/Unit/Collection/DbTest.php
@@ -4,8 +4,6 @@
  * See COPYING.txt for license details.
  */
 
-// @codingStandardsIgnoreFile
-
 namespace Magento\Framework\Data\Test\Unit\Collection;
 
 /**
@@ -44,10 +42,18 @@ protected function setUp()
     {
         $this->objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
         $this->fetchStrategyMock = $this->getMock(
-            \Magento\Framework\Data\Collection\Db\FetchStrategy\Query::class, ['fetchAll'], [], '', false
+            \Magento\Framework\Data\Collection\Db\FetchStrategy\Query::class,
+            ['fetchAll'],
+            [],
+            '',
+            false
         );
         $this->entityFactoryMock = $this->getMock(
-            \Magento\Framework\Data\Collection\EntityFactory::class, ['create'], [], '', false
+            \Magento\Framework\Data\Collection\EntityFactory::class,
+            ['create'],
+            [],
+            '',
+            false
         );
         $this->loggerMock = $this->getMock(\Psr\Log\LoggerInterface::class);
         $this->collection = new \Magento\Framework\Data\Test\Unit\Collection\DbCollection(
@@ -375,7 +381,11 @@ public function testFetchItem()
 
         $adapterMock = $this->getMock(
             \Magento\Framework\DB\Adapter\Pdo\Mysql::class,
-            ['select', 'query'], [], '', false);
+            ['select', 'query'],
+            [],
+            '',
+            false
+        );
         $selectMock = $this->getMock(
             \Magento\Framework\DB\Select::class,
             [],
@@ -430,9 +440,9 @@ public function testGetSize()
         $adapterMock->expects($this->exactly(2))
             ->method('quoteInto')
             ->will($this->returnValueMap([
-                        ['testField1=?', 'testValue1', null, null, 'testField1=testValue1'],
-                        ['testField4=?', 'testValue4', null, null, 'testField4=testValue4'],
-                    ]));
+                ['testField1=?', 'testValue1', null, null, 'testField1=testValue1'],
+                ['testField4=?', 'testValue4', null, null, 'testField4=testValue4'],
+            ]));
         $selectMock->expects($this->once())
             ->method('orWhere')
             ->with('testField1=testValue1');
@@ -558,7 +568,11 @@ public function testToOptionHash()
         $data = [10 => 'test'];
         $adapterMock = $this->getMock(
             \Magento\Framework\DB\Adapter\Pdo\Mysql::class,
-            ['select', 'query'], [], '', false);
+            ['select', 'query'],
+            [],
+            '',
+            false
+        );
         $selectMock = $this->getMock(
             \Magento\Framework\DB\Select::class,
             [],
diff --git a/lib/internal/Magento/Framework/Data/Test/Unit/Form/Element/AbstractElementTest.php b/lib/internal/Magento/Framework/Data/Test/Unit/Form/Element/AbstractElementTest.php
