rector: NewlineBeforeNewAssignSetRector (OpenMage#4997)

Author: sreichel

.rector.php

@@ -76,7 +76,6 @@
             CodingStyle\Catch_\CatchExceptionNameMatchingTypeRector::class, # todo: TMP
             CodingStyle\ClassMethod\FuncGetArgsToVariadicParamRector::class, # todo: TMP
             CodingStyle\ClassMethod\MakeInheritedMethodVisibilitySameAsParentRector::class, # todo: TMP
-            CodingStyle\ClassMethod\NewlineBeforeNewAssignSetRector::class, # todo: TMP
             CodingStyle\Encapsed\EncapsedStringsToSprintfRector::class, # todo: TMP
             CodingStyle\Encapsed\WrapEncapsedVariableInCurlyBracesRector::class, # todo: TMP
             CodingStyle\FuncCall\CallUserFuncArrayToVariadicRector::class, # todo: TMP

app/code/core/Mage/Admin/Model/Resource/Block.php

@@ -55,6 +55,7 @@ protected function _generateCache()
         /** @var Mage_Admin_Model_Resource_Block_Collection $collection */
         $collection = Mage::getResourceModel('admin/block_collection');
         $collection->addFieldToFilter('is_allowed', ['eq' => 1]);
+
         $disallowedBlockNames = $this->getDisallowedBlockNames();
         if (is_array($disallowedBlockNames) && count($disallowedBlockNames) > 0) {
             $collection->addFieldToFilter('block_name', ['nin' => $disallowedBlockNames]);

app/code/core/Mage/Admin/Model/Resource/Variable.php

@@ -26,6 +26,7 @@ protected function _generateCache()
         /** @var Mage_Admin_Model_Resource_Variable_Collection $collection */
         $collection = Mage::getResourceModel('admin/variable_collection');
         $collection->addFieldToFilter('is_allowed', ['eq' => 1]);
+
         $data = $collection->getColumnValues('variable_name');
         $data = array_flip($data);
         Mage::app()->saveCache(

app/code/core/Mage/Admin/Model/User.php

@@ -316,6 +316,7 @@ public function sendPasswordResetConfirmationEmail()
         $mailer = Mage::getModel('core/email_template_mailer');
         $emailInfo = Mage::getModel('core/email_info');
         $emailInfo->addTo($this->getEmail(), $this->getName());
+
         $mailer->addEmailInfo($emailInfo);
 
         // Set all required params and send emails
@@ -769,6 +770,7 @@ public function sendAdminNotification($user)
         $mailer    = Mage::getModel('core/email_template_mailer');
         $emailInfo = Mage::getModel('core/email_info');
         $emailInfo->addTo(array_filter($emails), $generalContactName);
+
         $mailer->addEmailInfo($emailInfo);
 
         // Set all required params and send emails

app/code/core/Mage/AdminNotification/Model/Feed.php

@@ -139,13 +139,15 @@ public function getFeedData()
             'timeout'   => 2,
         ]);
         $curl->write(Zend_Http_Client::GET, $this->getFeedUrl(), '1.0');
+
         $data = $curl->read();
         if ($data === false) {
             return false;
         }
 
         $data = preg_split('/^\r?$/m', $data, 2);
         $data = trim($data[1]);
+
         $curl->close();
 
         try {

app/code/core/Mage/Adminhtml/Block/Api/Tab/Userroles.php

@@ -18,6 +18,7 @@ public function __construct()
 
         $uid = $this->getRequest()->getParam('id', false);
         $uid = !empty($uid) ? $uid : 0;
+
         $roles = Mage::getModel('api/roles')
             ->getCollection()
             ->load();

app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Newsletter.php

@@ -24,6 +24,7 @@ public function initForm()
     {
         $form = new Varien_Data_Form();
         $form->setHtmlIdPrefix('_newsletter');
+
         $customer = $this->getRegistryCurrentCustomer();
         $subscriber = Mage::getModel('newsletter/subscriber')->loadByCustomer($customer);
         Mage::register('subscriber', $subscriber);

app/code/core/Mage/Adminhtml/Block/Notification/Security.php

@@ -59,6 +59,7 @@ protected function _isFileAccessible()
         $http = new Varien_Http_Adapter_Curl();
         $http->setConfig(['timeout' => $this->_verificationTimeOut]);
         $http->write(Zend_Http_Client::POST, $defaultUnsecureBaseURL . $this->_filePath);
+
         $responseBody = $http->read();
         $responseCode = Zend_Http_Response::extractCode($responseBody);
         $http->close();

app/code/core/Mage/Adminhtml/Block/Permissions/Tab/Userroles.php

@@ -18,6 +18,7 @@ public function __construct()
 
         $uid = $this->getRequest()->getParam('id', false);
         $uid = !empty($uid) ? $uid : 0;
+
         $roles = Mage::getModel('admin/roles')
             ->getCollection()
             ->load();

app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Image.php

@@ -31,6 +31,7 @@ protected function addValidators(Mage_Core_Model_File_Uploader $uploader)
         parent::addValidators($uploader);
         $validator = Mage::getModel('core/file_validator_image');
         $validator->setAllowedImageTypes($this->_getAllowedExtensions());
+
         $uploader->addValidateCallback(Mage_Core_Model_File_Validator_Image::NAME, $validator, 'validate');
     }
 }