Check the code style of tests and fix violations

Fixes #5
hellowearemito · Dec 2, 2016 · b685350 · b685350
1 parent 6bcbf43
commit b685350
Show file tree

Hide file tree

Showing 10 changed files with 33 additions and 36 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -28,6 +28,7 @@ before_script:
 
 script:
   - php ./vendor/bin/phpcs --standard=vendor/mito/yii2-coding-standards/Application src
+  - php ./vendor/bin/phpcs --standard=vendor/mito/yii2-coding-standards/Application -s --exclude=PSR1.Files.SideEffects,PSR1.Classes.ClassDeclaration --extensions=php  tests
   - php ./vendor/bin/codecept run unit -d $PHPUNIT_FLAGS
 
 after_success:

diff --git a/tests/_bootstrap.php b/tests/_bootstrap.php
@@ -9,6 +9,6 @@
 require_once dirname(__FILE__) . '/../vendor/sentry/sentry/test/Raven/Tests/ClientTest.php';
 Raven_Autoloader::register();
 
-$_SERVER['SCRIPT_FILENAME'] = '/' . dirname(__DIR__) .'/web';
+$_SERVER['SCRIPT_FILENAME'] = '/' . dirname(__DIR__) . '/web';
 $_SERVER['SCRIPT_NAME'] = __DIR__ . '/web';
 Yii::setAlias('@mitosentry', dirname(__DIR__));
diff --git a/tests/config/acceptance.php b/tests/config/acceptance.php
@@ -5,7 +5,5 @@
 return yii\helpers\ArrayHelper::merge(
     require(__DIR__ . '/../../../config/web.php'),
     require(__DIR__ . '/config.php'),
-    [
-
-    ]
+    []
 );
diff --git a/tests/config/config.php b/tests/config/config.php
@@ -3,9 +3,9 @@
  * Application configuration shared by all test types
  */
 
-$dbDsn = getenv("CI_DB_DSN");
-$dbUsername = getenv("CI_DB_USERNAME");
-$dbPassword = getenv("CI_DB_PASSWORD");
+$dbDsn = getenv('CI_DB_DSN');
+$dbUsername = getenv('CI_DB_USERNAME');
+$dbPassword = getenv('CI_DB_PASSWORD');
 
 $dbConfig = [
     'dsn' => 'mysql:host=localhost;dbname=yii2_basic_tests',

diff --git a/tests/config/console.php b/tests/config/console.php
@@ -5,7 +5,5 @@
 return yii\helpers\ArrayHelper::merge(
     require(__DIR__ . '/../../../config/console.php'),
     require(__DIR__ . '/config.php'),
-    [
-
-    ]
+    []
 );
diff --git a/tests/config/unit.php b/tests/config/unit.php
@@ -5,7 +5,5 @@
 return yii\helpers\ArrayHelper::merge(
     require(__DIR__ . '/../../../config/web.php'),
     require(__DIR__ . '/config.php'),
-    [
-
-    ]
+    []
 );
diff --git a/tests/unit/DummyRavenClient.php b/tests/unit/DummyRavenClient.php
@@ -7,7 +7,8 @@ class DummyRavenClient
     public $tags = [];
     public $dsn;
 
-    public function __construct($dsn, $options) {
+    public function __construct($dsn, $options)
+    {
         if (isset($options['tags'])) {
             $this->tags = $options['tags'];
         }

diff --git a/tests/unit/SentryComponentTest.php b/tests/unit/SentryComponentTest.php
@@ -137,15 +137,17 @@ public function testCapture()
 
     private function assertAssetRegistered($asset)
     {
-            if (Yii::$app->view instanceof \yii\web\View) {
-                $this->assertArrayHasKey($asset, Yii::$app->view->assetBundles);
-            }
+        if (Yii::$app->view instanceof \yii\web\View) {
+            $this->assertArrayHasKey($asset, Yii::$app->view->assetBundles);
         }
-        private function assertAssetNotRegistered($asset) {
-            if (Yii::$app->view instanceof \yii\web\View) {
-                $this->assertArrayNotHasKey($asset, Yii::$app->view->assetBundles);
-            }
+    }
+
+    private function assertAssetNotRegistered($asset)
+    {
+        if (Yii::$app->view instanceof \yii\web\View) {
+            $this->assertArrayNotHasKey($asset, Yii::$app->view->assetBundles);
         }
+    }
 
     public function testJsNotifierEnabledIfPublicDsnSet()
     {

diff --git a/tests/unit/SentryTargetTest.php b/tests/unit/SentryTargetTest.php
@@ -75,9 +75,9 @@ public function testFilter($filter, $expected)
         $logger = $this->mockLogger($target);
         foreach ($expected as $message) {
             $target->sentry->shouldReceive('capture')
-                ->with(Mockery::on(function($data) use ($message) {
+                ->with(Mockery::on(function ($data) use ($message) {
                     return $data['message'] === $message;
-                }), Mockery::on(function($traces) {
+                }), Mockery::on(function ($traces) {
                     return true;
                 }))->once();
         }
@@ -111,16 +111,16 @@ public function testFilterExceptions($except, $exceptionClass, $exceptionCode, $
         if ($expectLogged) {
             if ($type === self::EXCEPTION_TYPE_OBJECT) {
                 $target->sentry->shouldReceive('captureException')
-                    ->with(Mockery::on(function($exception) {
+                    ->with(Mockery::on(function ($exception) {
                         return ($exception instanceof \Throwable || $exception instanceof \Exception) && $exception->getMessage() === self::DEFAULT_ERROR_MESSAGE;
-                    }), Mockery::on(function($data) {
+                    }), Mockery::on(function ($data) {
                         return true;
                     }))->once();
             } else {
                 $target->sentry->shouldReceive('capture')
-                    ->with(Mockery::on(function($data) {
+                    ->with(Mockery::on(function ($data) {
                         return $data['message'] === self::DEFAULT_ERROR_MESSAGE;
-                    }), Mockery::on(function($traces) {
+                    }), Mockery::on(function ($traces) {
                         return true;
                     }))->once();
             }
@@ -130,9 +130,9 @@ public function testFilterExceptions($except, $exceptionClass, $exceptionCode, $
             $target->sentry->shouldNotReceive('captureMessage');
         }
         $target->sentry->shouldReceive('capture')
-            ->with(Mockery::on(function($data) {
+            ->with(Mockery::on(function ($data) {
                 return $data['message'] === 'sentinel';
-            }), Mockery::on(function($traces) {
+            }), Mockery::on(function ($traces) {
                 return true;
             }))->once();
 
@@ -159,7 +159,7 @@ public function filters()
             [['levels' => 0], ['A', 'B', 'C', 'D', 'E', 'F', 'G', 'H']],
             [
                 ['levels' => Logger::LEVEL_INFO | Logger::LEVEL_WARNING | Logger::LEVEL_ERROR | Logger::LEVEL_TRACE],
-                ['A', 'B', 'C', 'D', 'E', 'F', 'G', 'H']
+                ['A', 'B', 'C', 'D', 'E', 'F', 'G', 'H'],
             ],
             [['levels' => ['error']], ['B', 'G', 'H']],
             [['levels' => Logger::LEVEL_ERROR], ['B', 'G', 'H']],
@@ -181,7 +181,7 @@ public function filters()
             [['levels' => 0], ['A', 'B', 'C', 'D', 'E', 'F', 'G', 'H']],
             [
                 ['levels' => Logger::LEVEL_INFO | Logger::LEVEL_WARNING | Logger::LEVEL_ERROR | Logger::LEVEL_TRACE],
-                ['A', 'B', 'C', 'D', 'E', 'F', 'G', 'H']
+                ['A', 'B', 'C', 'D', 'E', 'F', 'G', 'H'],
             ],
             [['levels' => ['error']], ['B', 'G', 'H']],
             [['levels' => Logger::LEVEL_ERROR], ['B', 'G', 'H']],
@@ -229,8 +229,7 @@ public function exceptFilters()
             ]);
         }
 
-        $results = array_merge($results, [
-        ]);
+        $results = array_merge($results, []);
 
         return $results;
     }
@@ -255,9 +254,9 @@ private function createException($type, $exceptionClass, $exceptionCode)
     {
         switch ($type) {
             case self::EXCEPTION_TYPE_OBJECT:
-                if ($exceptionClass === HttpException::class){
+                if ($exceptionClass === HttpException::class) {
                     $args = [$exceptionCode, self::DEFAULT_ERROR_MESSAGE];
-                }else{
+                } else {
                     $args = [self::DEFAULT_ERROR_MESSAGE, $exceptionCode];
                 }
                 $exception = (new \ReflectionClass($exceptionClass))->newInstanceArgs($args);

diff --git a/tests/unit/config/main.php b/tests/unit/config/main.php
@@ -7,5 +7,5 @@
         'assetManager' => [
             'basePath' => '@mitosentry/tests/unit/runtime/web/assets',
         ],
-    ]
+    ],
 ];