Merge pull request #1072 from nexcess/scrutinizer-patch-2

Scrutinizer Auto-Fixes

Author: miguelbalparda

app/code/community/Nexcessnet/Turpentine/Helper/Data.php

@@ -231,16 +231,16 @@ public function getChildBlockNames($blockNode) {
      * @param  string|object $model
      * @return string
      */
-    public function getModelName( $model ) {
-        if( is_object( $model ) ) {
-            $model = get_class( $model );
+    public function getModelName($model) {
+        if (is_object($model)) {
+            $model = get_class($model);
         }
         // This guess may work if the extension uses its lowercased name as model group name.
-        $result = strtolower( preg_replace(
-            '~^[^_]+_([^_]+)_Model_(.+)$~', '$1/$2', $model ) );
+        $result = strtolower(preg_replace(
+            '~^[^_]+_([^_]+)_Model_(.+)$~', '$1/$2', $model ));
         // This check is not expensive because the answer should come from Magento's classNameCache
         $checkModel = Mage::getConfig()->getModelClassName($result);
-        if ( 'Mage_' == substr($checkModel,0,5) && !class_exists($result) ) {
+        if ('Mage_' == substr($checkModel, 0, 5) && ! class_exists($result)) {
             // Fallback to full model name.
             $result = $model;
         }

app/code/community/Nexcessnet/Turpentine/Model/Observer/Varnish.php

@@ -65,7 +65,7 @@ public function addProductListToolbarRewrite($eventObject) {
      */
     public function fixCmRedisSessionLocks($eventObject) {
         if (Mage::helper('core')->isModuleEnabled('Cm_RedisSession')) {
-            if (!empty($_COOKIE['frontend']) && 'crawler-session' == $_COOKIE['frontend']) {
+            if ( ! empty($_COOKIE['frontend']) && 'crawler-session' == $_COOKIE['frontend']) {
                 define('CM_REDISSESSION_LOCKING_ENABLED', false);
             }
         }

app/code/community/Nexcessnet/Turpentine/controllers/Adminhtml/CacheController.php

@@ -1,8 +1,8 @@
 <?php
 /**
-     * User: [email protected]
-     * Date: 08/01/14
-     */
+ * User: [email protected]
+ * Date: 08/01/14
+ */
 
 require_once Mage::getModuleDir('controllers', 'Mage_Adminhtml').DS.'CacheController.php';