sensiolabs code clean up

ecoco · Oct 10, 2016 · a0ff095 · a0ff095
1 parent ffabd26
commit a0ff095
Show file tree

Hide file tree

Showing 70 changed files with 120 additions and 98 deletions.
diff --git a/.coveralls.yml b/.coveralls.yml
@@ -1,2 +1,2 @@
 service_name: travis-ci
-coverage_clover: build/logs/clover.xml
+coverage_clover: build/logs/clover.xml
diff --git a/.sensiolabs.yml b/.sensiolabs.yml
@@ -0,0 +1,8 @@
+exclude_patterns:
+    - 'dev.php'
+    - '*.css.phtml'
+    - '*.js.phtml'
+
+rules:
+    php.psr1:
+        enabled: false
diff --git a/.travis.yml b/.travis.yml
@@ -63,4 +63,4 @@ script:
 
 after_success:
   - cd $TRAVIS_BUILD_DIR
-  - travis_retry build/magento/vendor/bin/coveralls -v
+  - travis_retry build/magento/vendor/bin/coveralls -v
diff --git a/LICENSE b/LICENSE
@@ -16,4 +16,4 @@ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
 AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
+THE SOFTWARE.
diff --git a/app/code/community/Ecocode/Profiler/Block/Collector/Base.php b/app/code/community/Ecocode/Profiler/Block/Collector/Base.php
@@ -1,5 +1,8 @@
 <?php
 
+/**
+ * Class Ecocode_Profiler_Block_Collector_Base
+ */
 class Ecocode_Profiler_Block_Collector_Base
     extends Mage_Core_Block_Template
 {
@@ -39,4 +42,4 @@ public function renderBag($bag, array $data = [])
 
         return $bagBlock->toHtml();
     }
-}
+}
diff --git a/app/code/community/Ecocode/Profiler/Block/Collector/Layout/Panel.php b/app/code/community/Ecocode/Profiler/Block/Collector/Layout/Panel.php
@@ -1,5 +1,8 @@
 <?php
 
+/**
+ * Class Ecocode_Profiler_Block_Collector_Layout_Panel
+ */
 class Ecocode_Profiler_Block_Collector_Layout_Panel
     extends Ecocode_Profiler_Block_Collector_Base
 {

diff --git a/app/code/community/Ecocode/Profiler/Block/Collector/Log/Panel.php b/app/code/community/Ecocode/Profiler/Block/Collector/Log/Panel.php
@@ -2,7 +2,6 @@
 
 /**
  * Class Ecocode_Profiler_Block_Collector_Log_Panel
- *
  */
 class Ecocode_Profiler_Block_Collector_Log_Panel
     extends Ecocode_Profiler_Block_Collector_Base
@@ -96,4 +95,4 @@ public function getLogTableRenderer()
         }
         return $this->logTableRenderer;
     }
-}
+}
diff --git a/app/code/community/Ecocode/Profiler/Block/Collector/Menu.php b/app/code/community/Ecocode/Profiler/Block/Collector/Menu.php
@@ -1,5 +1,8 @@
 <?php
 
+/**
+ * Class Ecocode_Profiler_Block_Collector_Menu
+ */
 class Ecocode_Profiler_Block_Collector_Menu extends
     Ecocode_Profiler_Block_Collector_Base
 {
@@ -8,4 +11,4 @@ public function _construct()
         parent::_construct();
         $this->setTemplate('ecocode_profiler/collector/base/menu.phtml');
     }
-}
+}
diff --git a/app/code/community/Ecocode/Profiler/Block/Collector/Mysql/Panel.php b/app/code/community/Ecocode/Profiler/Block/Collector/Mysql/Panel.php
@@ -1,5 +1,8 @@
 <?php
 
+/**
+ * Class Ecocode_Profiler_Block_Collector_Mysql_Panel
+ */
 class Ecocode_Profiler_Block_Collector_Mysql_Panel
     extends Ecocode_Profiler_Block_Collector_Base
 {
@@ -177,4 +180,4 @@ public function getQueryTableRenderer()
         }
         return $this->queryTableRenderer;
     }
-}
+}
diff --git a/app/code/community/Ecocode/Profiler/Block/Collector/Translation/Panel.php b/app/code/community/Ecocode/Profiler/Block/Collector/Translation/Panel.php
@@ -2,7 +2,6 @@
 
 /**
  * Class Ecocode_Profiler_Block_Collector_Translation_Panel
- *
  */
 class Ecocode_Profiler_Block_Collector_Translation_Panel
     extends Ecocode_Profiler_Block_Collector_Base
@@ -31,4 +30,4 @@ public function renderTable(array $messages)
         $tableBlock->setData('messages', $messages);
         return $tableBlock->toHtml();
     }
-}
+}
diff --git a/app/code/community/Ecocode/Profiler/Block/Profiler/Sidebar.php b/app/code/community/Ecocode/Profiler/Block/Profiler/Sidebar.php
@@ -1,5 +1,8 @@
 <?php
 
+/**
+ * Class Ecocode_Profiler_Block_Profiler_Sidebar
+ */
 class Ecocode_Profiler_Block_Profiler_Sidebar
     extends Mage_Core_Block_Template
 {
@@ -27,4 +30,4 @@ public function getProfile()
 
         return $this->profile;
     }
-}
+}
diff --git a/app/code/community/Ecocode/Profiler/Block/Profiler/Sidebar/Menu.php b/app/code/community/Ecocode/Profiler/Block/Profiler/Sidebar/Menu.php
@@ -1,5 +1,8 @@
 <?php
 
+/**
+ * Class Ecocode_Profiler_Block_Profiler_Sidebar_Menu
+ */
 class Ecocode_Profiler_Block_Profiler_Sidebar_Menu extends Mage_Core_Block_Template
 {
     protected $profile = null;
@@ -39,4 +42,4 @@ public function getProfile()
 
         return $this->profile;
     }
-}
+}
diff --git a/app/code/community/Ecocode/Profiler/Block/Renderer/Log/LogTable.php b/app/code/community/Ecocode/Profiler/Block/Renderer/Log/LogTable.php
@@ -2,7 +2,6 @@
 
 /**
  * Class Ecocode_Profiler_Block_Renderer_Log_LogTable
- *
  */
 class Ecocode_Profiler_Block_Renderer_Log_LogTable
     extends Ecocode_Profiler_Block_Renderer_AbstractRenderer

diff --git a/app/code/community/Ecocode/Profiler/Block/Renderer/Mysql/QueryTable.php b/app/code/community/Ecocode/Profiler/Block/Renderer/Mysql/QueryTable.php
@@ -2,7 +2,6 @@
 
 /**
  * Class Ecocode_Profiler_Block_Renderer_Context
- *
  */
 class Ecocode_Profiler_Block_Renderer_Mysql_QueryTable
     extends Ecocode_Profiler_Block_Renderer_AbstractRenderer

diff --git a/app/code/community/Ecocode/Profiler/Model/Collector/RequestDataCollector.php b/app/code/community/Ecocode/Profiler/Model/Collector/RequestDataCollector.php
@@ -84,10 +84,11 @@ public function collect(Mage_Core_Controller_Request_Http $request, Mage_Core_Co
         $sessionMetadata   = [];
         $sessionAttributes = [];
         //@TODO get all magento session singletons to split them by namespace
-        $session           = null;
         $flashes           = [];
 
-        /*        if (false && $request->hasSession()) {
+        /*
+        $session           = null
+        if (false && $request->hasSession()) {
                     $session = $request->getSession();
                     if ($session->isStarted()) {
                         $sessionMetadata['Created']   = date(DATE_RFC822, $session->getMetadataBag()->getCreated());

diff --git a/app/code/community/Ecocode/Profiler/Model/Observer.php b/app/code/community/Ecocode/Profiler/Model/Observer.php
@@ -47,7 +47,7 @@ public function controllerFrontSendResponseBefore(Varien_Event_Observer $observe
         $this->injectToolbar($response, $request, $token);
     }
 
-    public function onTerminate(Varien_Event_Observer $observer)
+    public function onTerminate()
     {
         foreach ($this->profiles as $request) {
             $this->getProfiler()->saveProfile($this->profiles[$request]);

diff --git a/app/code/community/Ecocode/Profiler/Model/Profiler.php b/app/code/community/Ecocode/Profiler/Model/Profiler.php
@@ -135,7 +135,7 @@ public function saveProfile(Ecocode_Profiler_Model_Profile $profile)
             }
         }
 
-        if (!($ret = $this->getStorage()->write($profile))) {
+        if (!$this->getStorage()->write($profile)) {
             throw new Exception('Unable to store the profiler information.', ['configured_storage' => get_class($this->storage)]);
         }
 

diff --git a/app/code/community/Ecocode/Profiler/Model/Profiler/FileStorage.php b/app/code/community/Ecocode/Profiler/Model/Profiler/FileStorage.php
@@ -147,7 +147,7 @@ public function write(Ecocode_Profiler_Model_Profile $profile)
         $data = [
             'token'        => $profile->getToken(),
             'parent'       => $profile->getParentToken(),
-            'children'     => array_map(function ($p) {
+            'children'     => array_map(function (Ecocode_Profiler_Model_Profile $p) {
                 return $p->getToken();
             }, $profile->getChildren()),
             'data'         => $profile->getCollectors(),

diff --git a/...Dev/Controller/AbstractControllerTest.php → ...Dev/Controller/AbstractControllerTest.php b/...Dev/Controller/AbstractControllerTest.php → ...Dev/Controller/AbstractControllerTest.php
@@ -3,7 +3,7 @@
 /**
  * Class Ecocode_Profiler_AbstractController
  */
-class Ecocode_Profiler_Test_Dev_Controller_AbstractControllerTest
+class Ecocode_Profiler_Tests_Dev_Controller_AbstractControllerTest
     extends TestHelper
 {
     protected function tearDown()
@@ -21,7 +21,7 @@ protected function tearDown()
     public function testAccessDenied()
     {
         $request    = new Mage_Core_Controller_Request_Http();
-        $response   = new Ecocode_Profiler_Test_Dev_Fixtures_ResponseHttp();
+        $response   = new Ecocode_Profiler_Tests_Dev_Fixtures_ResponseHttp();
         $controller = $this->getMockBuilder('Ecocode_Profiler_Controller_AbstractController')
             ->setMethods(['getApp'])
             ->setConstructorArgs([$request, $response])
@@ -38,7 +38,7 @@ public function testAccessDenied()
     public function testAccessAllow()
     {
         $request    = new Mage_Core_Controller_Request_Http();
-        $response   = new Ecocode_Profiler_Test_Dev_Fixtures_ResponseHttp();
+        $response   = new Ecocode_Profiler_Tests_Dev_Fixtures_ResponseHttp();
         $controller = $this->getMockBuilder('Ecocode_Profiler_Controller_AbstractController')
             ->setMethods(['getApp', '_rewrite'])
             ->setConstructorArgs([$request, $response])

diff --git a/...Ecocode/Profiler/Test/Dev/DevModeTest.php → ...cocode/Profiler/Tests/Dev/DevModeTest.php b/...Ecocode/Profiler/Test/Dev/DevModeTest.php → ...cocode/Profiler/Tests/Dev/DevModeTest.php
@@ -1,6 +1,6 @@
 <?php
 
-class Ecocode_Profiler_Test_DevModeTest
+class Ecocode_Profiler_Tests_DevModeTest
     extends TestHelper
 {
 

diff --git a/...r/Test/Dev/Fixtures/DummyCacheBackend.php → .../Tests/Dev/Fixtures/DummyCacheBackend.php b/...r/Test/Dev/Fixtures/DummyCacheBackend.php → .../Tests/Dev/Fixtures/DummyCacheBackend.php
@@ -1,6 +1,6 @@
 <?php
 
-class Ecocode_Profiler_Test_Dev_Fixtures_DummyCacheBackend
+class Ecocode_Profiler_Tests_Dev_Fixtures_DummyCacheBackend
     extends Zend_Cache_Backend
 {
     protected $_options = ['test_option' => 0];

diff --git a/...ofiler/Test/Dev/Fixtures/ResponseHttp.php → ...filer/Tests/Dev/Fixtures/ResponseHttp.php b/...ofiler/Test/Dev/Fixtures/ResponseHttp.php → ...filer/Tests/Dev/Fixtures/ResponseHttp.php
@@ -1,6 +1,6 @@
 <?php
 
-class Ecocode_Profiler_Test_Dev_Fixtures_ResponseHttp
+class Ecocode_Profiler_Tests_Dev_Fixtures_ResponseHttp
     extends Mage_Core_Controller_Response_Http
 {
     public function canSendHeaders($throw = true)

diff --git a/...ode/Profiler/Test/Dev/Helper/CodeTest.php → ...de/Profiler/Tests/Dev/Helper/CodeTest.php b/...ode/Profiler/Test/Dev/Helper/CodeTest.php → ...de/Profiler/Tests/Dev/Helper/CodeTest.php
@@ -1,6 +1,6 @@
 <?php
 
-class Ecocode_Profiler_Test_Dev_Helper_CodeTest
+class Ecocode_Profiler_Tests_Dev_Helper_CodeTest
     extends TestHelper
 {
     /**

diff --git a/.../Profiler/Test/Dev/Helper/ContextTest.php → ...Profiler/Tests/Dev/Helper/ContextTest.php b/.../Profiler/Test/Dev/Helper/ContextTest.php → ...Profiler/Tests/Dev/Helper/ContextTest.php
@@ -1,6 +1,6 @@
 <?php
 
-class Ecocode_Profiler_Test_Dev_Helper_ContextTest
+class Ecocode_Profiler_Tests_Dev_Helper_ContextTest
     extends TestHelper
 {
     public function testInit()

diff --git a/...ode/Profiler/Test/Dev/Helper/DataTest.php → ...de/Profiler/Tests/Dev/Helper/DataTest.php b/...ode/Profiler/Test/Dev/Helper/DataTest.php → ...de/Profiler/Tests/Dev/Helper/DataTest.php
@@ -1,6 +1,6 @@
 <?php
 
-class Ecocode_Profiler_Test_Dev_Helper_DataTest
+class Ecocode_Profiler_Tests_Dev_Helper_DataTest
     extends TestHelper
 {
     public function testGetClassGroup()

diff --git a/.../Profiler/Test/Dev/Helper/RewriteTest.php → ...Profiler/Tests/Dev/Helper/RewriteTest.php b/.../Profiler/Test/Dev/Helper/RewriteTest.php → ...Profiler/Tests/Dev/Helper/RewriteTest.php
@@ -1,6 +1,6 @@
 <?php
 
-class Ecocode_Profiler_Test_Dev_Helper_RewriteTest
+class Ecocode_Profiler_Tests_Dev_Helper_RewriteTest
     extends TestHelper
 {
 

diff --git a/...code/Profiler/Test/Dev/Helper/SqlTest.php → ...ode/Profiler/Tests/Dev/Helper/SqlTest.php b/...code/Profiler/Test/Dev/Helper/SqlTest.php → ...ode/Profiler/Tests/Dev/Helper/SqlTest.php
@@ -1,7 +1,7 @@
 <?php
 
 
-class Ecocode_Profiler_Test_Dev_Helper_SqlTest extends \PHPUnit_Framework_TestCase
+class Ecocode_Profiler_Tests_Dev_Helper_SqlTest extends \PHPUnit_Framework_TestCase
 {
     /**
      * @var Ecocode_Profiler_Helper_Sql

diff --git a/...ler/Test/Dev/Helper/ValueExporterTest.php → ...er/Tests/Dev/Helper/ValueExporterTest.php b/...ler/Test/Dev/Helper/ValueExporterTest.php → ...er/Tests/Dev/Helper/ValueExporterTest.php
@@ -1,6 +1,6 @@
 <?php
 
-class Ecocode_Profiler_Test_Dev_Helper_ValueExporterTest
+class Ecocode_Profiler_Tests_Dev_Helper_ValueExporterTest
     extends TestHelper
 {
     /**

diff --git a/...odel/Collector/CacheDataCollectorTest.php → ...odel/Collector/CacheDataCollectorTest.php b/...odel/Collector/CacheDataCollectorTest.php → ...odel/Collector/CacheDataCollectorTest.php
@@ -1,6 +1,6 @@
 <?php
 
-class Ecocode_Profiler_Test_Dev_Model_Collector_CacheDataCollectorTest
+class Ecocode_Profiler_Tests_Dev_Model_Collector_CacheDataCollectorTest
     extends TestHelper
 {
 
@@ -15,7 +15,7 @@ public function testCollect()
 
         $expectCacheList = json_decode('[{"id":"config","cache_type":"Configuration","description":"System(config.xml, local.xml) and modules configuration files(config.xml).","tags":"CONFIG","status":1},{"id":"layout","cache_type":"Layouts","description":"Layout building instructions.","tags":"LAYOUT_GENERAL_CACHE_TAG","status":1},{"id":"block_html","cache_type":"Blocks HTML output","description":"Page blocks HTML.","tags":"BLOCK_HTML","status":1},{"id":"translate","cache_type":"Translations","description":"Translation files.","tags":"TRANSLATE","status":1},{"id":"collections","cache_type":"Collections Data","description":"Collection data files.","tags":"COLLECTION_DATA","status":1},{"id":"eav","cache_type":"EAV types and attributes","description":"Entity types declaration cache.","tags":"EAV","status":1},{"id":"config_api","cache_type":"Web Services Configuration","description":"Web Services definition files (api.xml).","tags":"CONFIG_API","status":1},{"id":"config_api2","cache_type":"Web Services Configuration","description":"Web Services definition files (api2.xml).","tags":"CONFIG_API2","status":1}]', true);
 
-        $this->assertEquals('Ecocode_Profiler_Test_Dev_Fixtures_DummyCacheBackend', $collector->getBackendName());
+        $this->assertEquals('Ecocode_Profiler_Tests_Dev_Fixtures_DummyCacheBackend', $collector->getBackendName());
         $this->assertEquals(['test_option' => 1], $collector->getBackendOptions());
         $this->assertEquals($expectCacheList, $collector->getCacheList());
         $this->assertEmpty($collector->getCacheCalls());
@@ -50,7 +50,7 @@ public function testLateCollect()
 
     public function getMockedCollector($cacheTypes = [], $log = [])
     {
-        $cacheBackend = new Ecocode_Profiler_Test_Dev_Fixtures_DummyCacheBackend(['test_option' => 1]);
+        $cacheBackend = new Ecocode_Profiler_Tests_Dev_Fixtures_DummyCacheBackend(['test_option' => 1]);
 
         $cacheMock = $this->getMockBuilder('Ecocode_Profiler_Model_Core_Cache')
             ->setMethods(['getTypes', 'getBackend', 'getLog'])

diff --git a/...v/Model/Collector/ConfigCollectorTest.php → ...v/Model/Collector/ConfigCollectorTest.php b/...v/Model/Collector/ConfigCollectorTest.php → ...v/Model/Collector/ConfigCollectorTest.php
@@ -1,13 +1,13 @@
 <?php
 
-class Ecocode_Profiler_Test_Dev_Model_Collector_ConfigCollectorTest
+class Ecocode_Profiler_Tests_Dev_Model_Collector_ConfigCollectorTest
     extends TestHelper
 {
 
     public function testCollect()
     {
         $token    = 'XXX';
-        $response = new Ecocode_Profiler_Test_Dev_Fixtures_ResponseHttp();
+        $response = new Ecocode_Profiler_Tests_Dev_Fixtures_ResponseHttp();
         $response->setHeader('X-Debug-Token', $token);
         $collector = new Ecocode_Profiler_Model_Collector_ConfigDataCollector();
 

diff --git a/...el/Collector/ContextDataCollectorTest.php → ...el/Collector/ContextDataCollectorTest.php b/...el/Collector/ContextDataCollectorTest.php → ...el/Collector/ContextDataCollectorTest.php
@@ -1,6 +1,6 @@
 <?php
 
-class Ecocode_Profiler_Test_Dev_Model_Collector_ContextDataCollectorTest
+class Ecocode_Profiler_Tests_Dev_Model_Collector_ContextDataCollectorTest
     extends TestHelper
 {
 

diff --git a/...l/Collector/CustomerDataCollectorTest.php → ...l/Collector/CustomerDataCollectorTest.php b/...l/Collector/CustomerDataCollectorTest.php → ...l/Collector/CustomerDataCollectorTest.php
@@ -1,6 +1,6 @@
 <?php
 
-class Ecocode_Profiler_Test_Dev_Model_Collector_CustomerDataCollectorTest
+class Ecocode_Profiler_Tests_Dev_Model_Collector_CustomerDataCollectorTest
     extends TestHelper
 {
 

diff --git a/...odel/Collector/EventDataCollectorTest.php → ...odel/Collector/EventDataCollectorTest.php b/...odel/Collector/EventDataCollectorTest.php → ...odel/Collector/EventDataCollectorTest.php
@@ -1,6 +1,6 @@
 <?php
 
-class Ecocode_Profiler_Test_Dev_Model_Collector_EventDataCollectorTest
+class Ecocode_Profiler_Tests_Dev_Model_Collector_EventDataCollectorTest
     extends TestHelper
 {
 

diff --git a/...del/Collector/LayoutDataCollectorTest.php → ...del/Collector/LayoutDataCollectorTest.php b/...del/Collector/LayoutDataCollectorTest.php → ...del/Collector/LayoutDataCollectorTest.php
@@ -1,6 +1,6 @@
 <?php
 
-class Ecocode_Profiler_Test_Dev_Model_Collector_LayoutDataCollectorTest
+class Ecocode_Profiler_Tests_Dev_Model_Collector_LayoutDataCollectorTest
     extends TestHelper
 {
     public function testBeforeToHtmlNoParent()

diff --git a/.../Model/Collector/LogDataCollectorTest.php → .../Model/Collector/LogDataCollectorTest.php b/.../Model/Collector/LogDataCollectorTest.php → .../Model/Collector/LogDataCollectorTest.php
@@ -1,6 +1,6 @@
 <?php
 
-class Ecocode_Profiler_Test_Dev_Model_Collector_LogDataCollectorTest
+class Ecocode_Profiler_Tests_Dev_Model_Collector_LogDataCollectorTest
     extends TestHelper
 {
 

diff --git a/...del/Collector/MemoryDataCollectorTest.php → ...del/Collector/MemoryDataCollectorTest.php b/...del/Collector/MemoryDataCollectorTest.php → ...del/Collector/MemoryDataCollectorTest.php
@@ -1,6 +1,6 @@
 <?php
 
-class Ecocode_Profiler_Test_Dev_Model_Collector_MemoryDataCollectorTest
+class Ecocode_Profiler_Tests_Dev_Model_Collector_MemoryDataCollectorTest
     extends TestHelper
 {