Merge pull request #9 from braincrafted/typehint-fix

Typehint fix

Author: Florian Eckerstorfer

.gitignore

@@ -2,3 +2,4 @@ vendor/
 composer.lock
 *.sublime-project
 *.sublime-workspace
+.idea/

README.md

@@ -1,13 +1,15 @@
 BraincraftedTestingBundle
 =========================
 
-Handcrafted in Vienna by [Florian Eckerstorfer](http://braincrafted.com).
+Handcrafted in Vienna by [Florian Eckerstorfer](https://florian.ec).
 
 
 About
 -----
 
-This bundle currently provides an abstract class to better isolate functional tests of Symfony2 applications. The `WebTestCase` class drops the schema, recreates it and loads all fixture files. Currently [DoctrineFixturesBundle](https://github.com/doctrine/DoctrineFixturesBundle) is a required dependency of this bundle.
+This bundle currently provides an abstract class to better isolate functional tests of Symfony2 applications. The
+`WebTestCase` class drops the schema, recreates it and loads all fixture files. Currently
+[DoctrineFixturesBundle](https://github.com/doctrine/DoctrineFixturesBundle) is a required dependency of this bundle.
 
 At some point this bundle may contain other useful classes, services and helpers related to testing.
 
@@ -20,12 +22,15 @@ You need to add bundle to your `composer.json` file:
 ```json
 {
     "require-dev": {
-        "braincrafted/testing-bundle": "dev-master"
+        "braincrafted/testing-bundle": "@stable"
     }
 }
 ```
 
-The master branch has been updated to be compatible with Symfony 2.3. If you are using Symfony <2.3 you can use the `0.1` branch.
+*Tip: You should replace `@stable` with a specific [version](https://github.com/braincrafted/testing-bundle/releases).*
+
+The master branch has been updated to be compatible with Symfony 2.3. If you are using Symfony <2.3 you can use the
+`0.1` branch.
 
 ```json
 {
@@ -35,7 +40,8 @@ The master branch has been updated to be compatible with Symfony 2.3. If you are
 }
 ```
 
-Add the bundle to your kernel (only activate the bundle in the dev and test environment, you don't need to have it activated in the production environment):
+Add the bundle to your kernel (only activate the bundle in the dev and test environment, you don't need to have it
+activated in the production environment):
 
 ```php
 // app/AppKernel.php
@@ -72,7 +78,8 @@ class DemoTest extends WebTestCase
 }
 ```
 
-By default `WebTestCase` provides a `setUp()` and a `tearDown()` method that boot respectively shut down the kernel. However, if you have your own `setUp()` and/or `tearDown()` methods in your test case you need to manually do this.
+By default `WebTestCase` provides a `setUp()` and a `tearDown()` method that boot respectively shut down the kernel.
+However, if you have your own `setUp()` and/or `tearDown()` methods in your test case you need to manually do this.
 
 ```php
 // AcmeDemoBundle/Tests/DemoTest.php
@@ -112,30 +119,46 @@ $container = $this->getContainer();
 
 ### Render Crawler HTML
 
-The `WebTestCase` class also has an nice helper method that returns the HTML code of a crawler. You can use it in all test cases that subclass `Braincrafted\Bundle\TestingBundle\Test\WebTestCase`:
+The `WebTestCase` class also has an nice helper method that returns the HTML code of a crawler. You can use it in all
+test cases that subclass `Braincrafted\Bundle\TestingBundle\Test\WebTestCase`:
 
 ```php
 echo $this->renderCrawlerHtml($crawler);
 ```
 
 ### Testing Translation Keys
 
-`BraincraftedTestingBundle` installs an alternative translator that is only activated in the `test` environment. This translator returns the translation key instead of the translated text. That way you can use the translation keys in your functional tests instead of the translated text.
+`BraincraftedTestingBundle` installs an alternative translator that is only activated in the `test` environment. This
+translator returns the translation key instead of the translated text. That way you can use the translation keys in your
+functional tests instead of the translated text.
 
 
-License
--------
+Change Log
+----------
+
+### Version 0.3.1 (25 August 2014)
+
+- Fixed type hint for `WebTestCase::createClient()` method
+- Pass `$options` to `WebTestCase::createKernel()` in `WebTestCase::createClient()`
 
-### The MIT License (MIT)
 
-Copyright (c) 2012-2013 Florian Eckerstorfer
+### Version 0.3 (18 November 2013)
 
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+- Changed namespace to `Braincrafted`.
 
-The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
 
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 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.
+License
+-------
+
+### The MIT License (MIT)
+
+Copyright (c) 2012-2014 Florian Eckerstorfer
 
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated
+ documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 
-[![Bitdeli Badge](https://d2weczhvl823v0.cloudfront.net/braincrafted/testing-bundle/trend.png)](https://bitdeli.com/free "Bitdeli Badge")
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the
+ Software.
 
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, 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.

Test/WebTestCase.php

@@ -8,6 +8,7 @@
 namespace Braincrafted\Bundle\TestingBundle\Test;
 
 use Symfony\Bundle\FrameworkBundle\Console\Application;
+use Symfony\Component\BrowserKit\Client;
 use Symfony\Component\Console\Input\ArrayInput;
 use Symfony\Component\DomCrawler\Crawler;
 
@@ -23,7 +24,7 @@
  */
 abstract class WebTestCase extends \PHPUnit_Framework_TestCase
 {
-    /** @var \AppKernel */
+    /** @var \Symfony\Component\HttpKernel\Kernel */
     protected $kernel;
 
     /** @var Application */
@@ -84,15 +85,16 @@ protected function tearDownKernel()
     /**
      * Creates an AppKernel.
      *
-     * @param  array  $options The array with options for the kernel.
+     * @param array $options The array with options for the kernel.
      *
-     * @return \AppKernel The app kernel
+     * @return \Symfony\Component\HttpKernel\Kernel The app kernel
      */
     protected function createKernel(array $options = array())
     {
         if (!class_exists('\AppKernel')) {
             require_once $_SERVER['KERNEL_DIR'].'/AppKernel.php';
         }
+
         return new \AppKernel(
             isset($options['environment']) ? $options['environment'] : 'test',
             isset($options['debug']) ? $options['debug'] : true
@@ -110,7 +112,7 @@ protected function createKernel(array $options = array())
     protected function createClient(array $options = array(), array $server = array())
     {
         if (null === $this->kernel) {
-            $this->setUpKernel();
+            $this->setUpKernel($options);
         }
 
         $client = $this->getContainer()->get('test.client');