Fix tests

- Repair coding style
- Change travis settings
- Upgrade doctrine require-dev version
- application.scanDirs: false

.travis.yml

@@ -10,7 +10,7 @@ matrix:
         - php: hhvm
 
 before_install:
-    - if [ $TRAVIS_PHP_VERSION = '5.6' ]; then COVERAGE="-c `php -i | grep 'xdebug.ini'` --coverage coverage.xml --coverage-src src/"; else COVERAGE="" && if [ $TRAVIS_PHP_VERSION = '5.6' ]; then phpenv config-rm xdebug.ini; fi; fi
+    - if [ $TRAVIS_PHP_VERSION = '5.6' ]; then COVERAGE="-c `php -i | grep 'xdebug.ini'` --coverage coverage.xml --coverage-src=src/ "; else COVERAGE="" && if [ $TRAVIS_PHP_VERSION = '5.6' ]; then phpenv config-rm xdebug.ini; fi; fi
     - composer global require hirak/prestissimo
 
 install:

composer.json

@@ -44,7 +44,7 @@
         "nette/tester": "~1.7.1",
         "mockery/mockery": "~0.9.3",
         "dibi/dibi": "~3.0.1",
-        "kdyby/doctrine": "~3.1.2",
+        "kdyby/doctrine": "~3.3.0",
         "squizlabs/php_codesniffer": "~2.5"
     }
 }

src/Grid.php

@@ -141,10 +141,10 @@ class Grid extends Components\Container
     public function __construct()
     {
         parent::__construct();
-        list($parent, $name) = func_get_args() + [null, null];
-        if ($parent !== null) {
+        list($parent, $name) = func_get_args() + [NULL, NULL];
+        if ($parent !== NULL) {
             $parent->addComponent($this, $name);
-         } elseif (is_string($name)) {
+        } elseif (is_string($name)) {
             $this->name = $name;
         }
     }

tests/Components/Operation.phpt

@@ -61,7 +61,7 @@ class OperationTest extends \Tester\TestCase
             $grid->addColumnText('b', 'B');
             $grid->setOperation(['edit' => 'Edit', 'del' => 'Del'], function($operation, $id) {
                 Assert::same('edit', $operation);
-                Assert::same(['2','4'], $id);
+                Assert::same(['2', '4'], $id);
             });
         };
         Helper::grid(function(Grid $grid) use ($definition) {

tests/Grid/Grid.phpt

@@ -241,7 +241,7 @@ class GridTest extends \Tester\TestCase
         Assert::type('\Grido\Translations\FileTranslator', $grid->translator);
 
         Assert::exception(function() use ($grid) {
-            $grid->translator->lang = 'aa';
+            $grid->translator->setLang('aa');
         }, '\Grido\Exception');
     }
 

tests/Grid/GridAsSubcomponent.phpt

@@ -26,15 +26,19 @@ class GridInSubcomponentTest extends \Tester\TestCase
 
         $presenter->onStartUp[] = function(TestPresenter $presenter){
 
-            $subcomponent1 = new Subcomponent($presenter, 'subcomponent1');
-            $grid1 = new Grid($subcomponent1, 'grid');
+            $subcomponent1 = new Subcomponent();
+            $presenter->addComponent($subcomponent1, 'subcomponent1');
+            $grid1 = new Grid();
+            $subcomponent1->addComponent($grid1, 'grid1');
             $grid1->setRememberState();
             $session1 = $grid1->getRememberSession();
             $session1->name = 'a';
             Assert::same($session1->name, 'a');
 
-            $subcomponent2 = new Subcomponent($presenter, 'subcomponent2');
-            $grid2 = new Grid($subcomponent2, 'grid');
+            $subcomponent2 = new Subcomponent();
+            $presenter->addComponent($subcomponent2, 'subcomponent2');
+            $grid2 = new Grid();
+            $subcomponent2->addComponent($grid2, 'grid2');
             $grid2->setRememberState();
             $session2 = $grid2->getRememberSession();
             $session2->name = 'b';
@@ -48,4 +52,4 @@ class GridInSubcomponentTest extends \Tester\TestCase
     }
 }
 
-run(__FILE__);
+run(__FILE__);

tests/Grid/render.multi.phpt

@@ -31,7 +31,8 @@ class Multirender extends \Tester\TestCase
             $grid->addColumnText('surname', 'Surname');
             $grid->addColumnText('gender', 'Gender');
             $grid->addColumnText('birthday', 'Birthday');
-            $grid->templateFile = $grid->customization->templateFiles[$template];
+            $templateFiles = $grid->customization->getTemplateFiles();
+            $grid->templateFile = $templateFiles[$template];
         };
 
         $addFilters = function($grid) {
@@ -178,4 +179,4 @@ class Multirender extends \Tester\TestCase
     }
 }
 
-run(__FILE__);
+run(__FILE__);

tests/config.neon

@@ -25,5 +25,8 @@ doctrine:
 extensions:
     console: Kdyby\Console\DI\ConsoleExtension
 
+application:
+    scanDirs: false
+
 di:
-    accessors: true
+    accessors: true