diegoangel / informe-gei

module/Api/src/Factory/DistributionReportControllerFactory.php

Indentation +6 added lines, -6 removed lines

@@ -12,10 +12,10 @@
  */
 class DistributionReportControllerFactory implements FactoryInterface
 {
-    public function __invoke(ContainerInterface $container, $requestedName, array $options = null)
-    {
-        return new DistributionReportController(
-            $container->get(AdapterInterface::class)
-        );
-    }
+	public function __invoke(ContainerInterface $container, $requestedName, array $options = null)
+	{
+		return new DistributionReportController(
+			$container->get(AdapterInterface::class)
+		);
+	}
 }

module/Api/config/module.config.php

Indentation +109 added lines, -109 removed lines

@@ -12,113 +12,113 @@
 use Zend\ServiceManager\Factory\InvokableFactory;
 
 return [
-    'router' => [
-        'routes' => [
-        // Distribution Report Routes
-            'informe-todos-sectores' => [
-                'type'    => Segment::class,
-                'options' => [
-                    'route'    => '/informe/distribucion-sectores[/:ano]',
-                    'defaults' => [
-                        'controller' => Controller\DistributionReportController::class,
-                        'action'     => 'getWholeSectoralDistribution',
-                    ],
-                ],
-            ],
-            'informe-por-sector' => [
-                'type'    => Segment::class,
-                'options' => [
-                    'route'    => '/informe/distribucion-sector[/:ano[/:sector_id]]',
-                    'defaults' => [
-                        'controller' => Controller\DistributionReportController::class,
-                        'action'     => 'getSectoralDistribution',
-                    ],
-                ],
-            ],
-            'informe-gas' => [
-                'type'    => Segment::class,
-                'options' => [
-                    'route'    => '/informe/distribucion-gases[/:ano]',
-                    'defaults' => [
-                        'controller' => Controller\DistributionReportController::class,
-                        'action'     => 'getGasesDistribution',
-                    ],
-                ],
-            ],
-            'informe-gas-por-sector' => [
-                'type'    => Segment::class,
-                'options' => [
-                    'route'    => '/informe/distribucion-gases-sector[/:ano]',
-                    'defaults' => [
-                        'controller' => Controller\DistributionReportController::class,
-                        'action'     => 'getSectoralGasesDistribution',
-                    ],
-                ],
-            ],        
-            // Evolution Report Routes
-            'informe-evolucion-sectores' => [
-                'type'    => Segment::class,
-                'options' => [
-                    'route'    => '/informe/evolucion-sectores',
-                    'defaults' => [
-                        'controller' => Controller\EvolutionReportController::class,
-                        'action'     => 'getWholeSectoralEvolution',
-                    ],
-                ],
-            ], 
-            'informe-evolucion-sector' => [
-                'type'    => Segment::class,
-                'options' => [
-                    'route'    => '/informe/evolucion-sector[/:sector_id]',
-                    'defaults' => [
-                        'controller' => Controller\EvolutionReportController::class,
-                        'action'     => 'getSectoralEvolution',
-                    ],
-                ],
-            ], 
-            'informe-evolucion-sector-subactividad' => [
-                'type'    => Segment::class,
-                'options' => [
-                    'route'    => '/informe/evolucion-sector-subactividad[/:sector_id]',
-                    'defaults' => [
-                        'controller' => Controller\EvolutionReportController::class,
-                        'action'     => 'getSectoralEvolutionSubactivity',
-                    ],
-                ],
-            ], 
-            'informe-evolucion-sector-subactividad-categoria' => [
-                'type'    => Segment::class,
-                'options' => [
-                    'route'    => '/informe/evolucion-sector-subactividad-categoria[/:sector_id[/:subactividad_id]]',
-                    'defaults' => [
-                        'controller' => Controller\EvolutionReportController::class,
-                        'action'     => 'getSectoralEvolutionSubactivityCategory',
-                    ],
-                ],
-            ],                         
-            // Indicators Report Routes
-            'informe-indicador' => [
-                'type'    => Segment::class,
-                'options' => [
-                    'route'    => '/informe/indicador[/:indicador_id]',
-                    'defaults' => [
-                        'controller' => Controller\IndicatorsReportController::class,
-                        'action'     => 'getIndicator',
-                    ],
-                ],
-            ],             
-        ],
-    ],
-    'controllers' => [
-        'factories' => [
-            Controller\DistributionReportController::class => Factory\DistributionReportControllerFactory::class,
-            Controller\EvolutionReportController::class => Factory\EvolutionReportControllerFactory::class,
-             Controller\IndicatorsReportController::class => Factory\IndicatorsReportControllerFactory::class,     
-        ],
-    ],
-    'view_manager' => [
-        'strategies' => [
-            'ViewJsonStrategy'
-        ],        
-    ],
+	'router' => [
+		'routes' => [
+		// Distribution Report Routes
+			'informe-todos-sectores' => [
+				'type'    => Segment::class,
+				'options' => [
+					'route'    => '/informe/distribucion-sectores[/:ano]',
+					'defaults' => [
+						'controller' => Controller\DistributionReportController::class,
+						'action'     => 'getWholeSectoralDistribution',
+					],
+				],
+			],
+			'informe-por-sector' => [
+				'type'    => Segment::class,
+				'options' => [
+					'route'    => '/informe/distribucion-sector[/:ano[/:sector_id]]',
+					'defaults' => [
+						'controller' => Controller\DistributionReportController::class,
+						'action'     => 'getSectoralDistribution',
+					],
+				],
+			],
+			'informe-gas' => [
+				'type'    => Segment::class,
+				'options' => [
+					'route'    => '/informe/distribucion-gases[/:ano]',
+					'defaults' => [
+						'controller' => Controller\DistributionReportController::class,
+						'action'     => 'getGasesDistribution',
+					],
+				],
+			],
+			'informe-gas-por-sector' => [
+				'type'    => Segment::class,
+				'options' => [
+					'route'    => '/informe/distribucion-gases-sector[/:ano]',
+					'defaults' => [
+						'controller' => Controller\DistributionReportController::class,
+						'action'     => 'getSectoralGasesDistribution',
+					],
+				],
+			],        
+			// Evolution Report Routes
+			'informe-evolucion-sectores' => [
+				'type'    => Segment::class,
+				'options' => [
+					'route'    => '/informe/evolucion-sectores',
+					'defaults' => [
+						'controller' => Controller\EvolutionReportController::class,
+						'action'     => 'getWholeSectoralEvolution',
+					],
+				],
+			], 
+			'informe-evolucion-sector' => [
+				'type'    => Segment::class,
+				'options' => [
+					'route'    => '/informe/evolucion-sector[/:sector_id]',
+					'defaults' => [
+						'controller' => Controller\EvolutionReportController::class,
+						'action'     => 'getSectoralEvolution',
+					],
+				],
+			], 
+			'informe-evolucion-sector-subactividad' => [
+				'type'    => Segment::class,
+				'options' => [
+					'route'    => '/informe/evolucion-sector-subactividad[/:sector_id]',
+					'defaults' => [
+						'controller' => Controller\EvolutionReportController::class,
+						'action'     => 'getSectoralEvolutionSubactivity',
+					],
+				],
+			], 
+			'informe-evolucion-sector-subactividad-categoria' => [
+				'type'    => Segment::class,
+				'options' => [
+					'route'    => '/informe/evolucion-sector-subactividad-categoria[/:sector_id[/:subactividad_id]]',
+					'defaults' => [
+						'controller' => Controller\EvolutionReportController::class,
+						'action'     => 'getSectoralEvolutionSubactivityCategory',
+					],
+				],
+			],                         
+			// Indicators Report Routes
+			'informe-indicador' => [
+				'type'    => Segment::class,
+				'options' => [
+					'route'    => '/informe/indicador[/:indicador_id]',
+					'defaults' => [
+						'controller' => Controller\IndicatorsReportController::class,
+						'action'     => 'getIndicator',
+					],
+				],
+			],             
+		],
+	],
+	'controllers' => [
+		'factories' => [
+			Controller\DistributionReportController::class => Factory\DistributionReportControllerFactory::class,
+			Controller\EvolutionReportController::class => Factory\EvolutionReportControllerFactory::class,
+			 Controller\IndicatorsReportController::class => Factory\IndicatorsReportControllerFactory::class,     
+		],
+	],
+	'view_manager' => [
+		'strategies' => [
+			'ViewJsonStrategy'
+		],        
+	],
 ];

module/Api/test/Controller/IndicatorsReportControllerTest.php

Indentation +77 added lines, -77 removed lines

@@ -16,81 +16,81 @@
 
 class IndicatorsReportControllerTest extends AbstractHttpControllerTestCase
 {
-    use TestCaseTrait;
-
-    private static $pdo = null;
-
-    private $conn = null;
-
-    public function setUp()
-    {
-        $configOverrides = [];
-
-        $this->setApplicationConfig(ArrayUtils::merge(
-            include __DIR__ . '/../../../../config/application.config.php',
-            $configOverrides
-        ));
-
-        $services = $this->getApplicationServiceLocator();
-        $config = $services->get('config');
-        unset($config['db']);
-        $services->setAllowOverride(true);
-        $services->setService('config', $config);
-        $services->setAllowOverride(false);
-
-        parent::setUp();
-    }
-
-    final public function getConnection()
-    {
-        if ($this->conn === null) {
-            if (self::$pdo == null) {
-                self::$pdo = new PDO('sqlite::memory:');
-            }
-            $this->conn = $this->createDefaultDBConnection(self::$pdo, ':memory:');
-        }
-
-        return $this->conn;
-    }
-
-    protected function getDataSet()
-    {
-        return $this->createXMLDataSet(__DIR__ . '/../fixtures/database.xml');
-    }
-
-    public function testGetIndicatorActionCanBeAccessed()
-    {
-        $this->dispatch('/informe/indicador/2', 'GET');
-        $this->assertResponseStatusCode(200);
-        $this->assertResponseHeaderContains('Content-Type', 'application/json; charset=utf-8');
-        $this->assertModuleName('api');
-        $this->assertControllerName(IndicatorsReportController::class);
-        $this->assertControllerClass('IndicatorsReportController');
-        $this->assertMatchedRouteName('informe-indicador');
-
-        $data = $this->getResponse()->getContent();
-
-        $this->assertJson($data);
-
-        $data = Json::decode($data, Json::TYPE_ARRAY);
-
-        $this->assertArrayHasKey('column_1', $data);
-        $this->assertArrayHasKey('colores', $data);
-        $this->assertArrayHasKey('column_2', $data);
-        $this->assertArrayHasKey('descripcion', $data);
-        $this->assertArrayHasKey('unidad', $data);
-        $this->assertArrayHasKey('indicador', $data);                        
-    }
-
-    public function testInvalidRouteDoesNotCrash()
-    {
-        $this->dispatch('/invalid/route', 'GET');
-        $this->assertResponseStatusCode(404);
-    }
-
-    // public function testInvalidHttpVerbDoesNotCrash()
-    // {
-    //     $this->dispatch('/informe/distribucion-sectores/2014', 'DELETE');
-    //     $this->assertResponseStatusCode(405);
-    // }
+	use TestCaseTrait;
+
+	private static $pdo = null;
+
+	private $conn = null;
+
+	public function setUp()
+	{
+		$configOverrides = [];
+
+		$this->setApplicationConfig(ArrayUtils::merge(
+			include __DIR__ . '/../../../../config/application.config.php',
+			$configOverrides
+		));
+
+		$services = $this->getApplicationServiceLocator();
+		$config = $services->get('config');
+		unset($config['db']);
+		$services->setAllowOverride(true);
+		$services->setService('config', $config);
+		$services->setAllowOverride(false);
+
+		parent::setUp();
+	}
+
+	final public function getConnection()
+	{
+		if ($this->conn === null) {
+			if (self::$pdo == null) {
+				self::$pdo = new PDO('sqlite::memory:');
+			}
+			$this->conn = $this->createDefaultDBConnection(self::$pdo, ':memory:');
+		}
+
+		return $this->conn;
+	}
+
+	protected function getDataSet()
+	{
+		return $this->createXMLDataSet(__DIR__ . '/../fixtures/database.xml');
+	}
+
+	public function testGetIndicatorActionCanBeAccessed()
+	{
+		$this->dispatch('/informe/indicador/2', 'GET');
+		$this->assertResponseStatusCode(200);
+		$this->assertResponseHeaderContains('Content-Type', 'application/json; charset=utf-8');
+		$this->assertModuleName('api');
+		$this->assertControllerName(IndicatorsReportController::class);
+		$this->assertControllerClass('IndicatorsReportController');
+		$this->assertMatchedRouteName('informe-indicador');
+
+		$data = $this->getResponse()->getContent();
+
+		$this->assertJson($data);
+
+		$data = Json::decode($data, Json::TYPE_ARRAY);
+
+		$this->assertArrayHasKey('column_1', $data);
+		$this->assertArrayHasKey('colores', $data);
+		$this->assertArrayHasKey('column_2', $data);
+		$this->assertArrayHasKey('descripcion', $data);
+		$this->assertArrayHasKey('unidad', $data);
+		$this->assertArrayHasKey('indicador', $data);                        
+	}
+
+	public function testInvalidRouteDoesNotCrash()
+	{
+		$this->dispatch('/invalid/route', 'GET');
+		$this->assertResponseStatusCode(404);
+	}
+
+	// public function testInvalidHttpVerbDoesNotCrash()
+	// {
+	//     $this->dispatch('/informe/distribucion-sectores/2014', 'DELETE');
+	//     $this->assertResponseStatusCode(405);
+	// }
 }

Spacing +2 added lines, -2 removed lines

@@ -27,7 +27,7 @@ 
         $configOverrides = [];
 
         $this->setApplicationConfig(ArrayUtils::merge(
-            include __DIR__ . '/../../../../config/application.config.php',
+            include __DIR__.'/../../../../config/application.config.php',
             $configOverrides
         ));
 
@@ -55,7 +55,7 @@ 
 
     protected function getDataSet()
     {
-        return $this->createXMLDataSet(__DIR__ . '/../fixtures/database.xml');
+        return $this->createXMLDataSet(__DIR__.'/../fixtures/database.xml');
     }
 
     public function testGetIndicatorActionCanBeAccessed()

module/Api/test/Controller/DistributionReportControllerTest.php

Indentation +133 added lines, -133 removed lines

@@ -16,137 +16,137 @@
 
 class DistributionReportControllerTest extends AbstractHttpControllerTestCase
 {
-    use TestCaseTrait;
-
-    private static $pdo = null;
-
-    private $conn = null;
-
-    public function setUp()
-    {
-        $configOverrides = [];
-
-        $this->setApplicationConfig(ArrayUtils::merge(
-            include __DIR__ . '/../../../../config/application.config.php',
-            $configOverrides
-        ));
-
-        $services = $this->getApplicationServiceLocator();
-        $config = $services->get('config');
-        unset($config['db']);
-        $services->setAllowOverride(true);
-        $services->setService('config', $config);
-        $services->setAllowOverride(false);
-
-        parent::setUp();
-    }
-
-    final public function getConnection()
-    {
-        if ($this->conn === null) {
-            if (self::$pdo == null) {
-                self::$pdo = new PDO('sqlite::memory:');
-            }
-            $this->conn = $this->createDefaultDBConnection(self::$pdo, ':memory:');
-        }
-
-        return $this->conn;
-    }
-
-    protected function getDataSet()
-    {
-        return $this->createXMLDataSet(__DIR__ . '/../fixtures/database.xml');
-    }
-
-    public function testGetWholeSectoralDistributionActionActionCanBeAccessed()
-    {
-        $this->dispatch('/informe/distribucion-sectores/2014', 'GET');
-        $this->assertResponseStatusCode(200);
-        $this->assertResponseHeaderContains('Content-Type', 'application/json; charset=utf-8');
-        $this->assertModuleName('api');
-        $this->assertControllerName(DistributionReportController::class);
-        $this->assertControllerClass('DistributionReportController');
-        $this->assertMatchedRouteName('informe-todos-sectores');
-
-        $data = $this->getResponse()->getContent();
-
-        $this->assertJson($data);
-
-        $data = Json::decode($data, Json::TYPE_ARRAY);
-
-        $this->assertArrayHasKey('sector_1', $data);
-        $this->assertArrayHasKey('colores', $data);
-        $this->assertArrayHasKey('descripciones', $data);
-    }
-
-    public function testGetSectoralDistributionActionCanBeAccessed()
-    {
-        $this->dispatch('/informe/distribucion-sector/2014/1', 'GET');
-        $this->assertResponseStatusCode(200);
-        $this->assertResponseHeaderContains('Content-Type', 'application/json; charset=utf-8');
-        $this->assertModuleName('api');
-        $this->assertControllerName(DistributionReportController::class);
-        $this->assertControllerClass('DistributionReportController');
-        $this->assertMatchedRouteName('informe-por-sector');
-
-        $data = $this->getResponse()->getContent();
-
-        $this->assertJson($data);
-
-        $data = Json::decode($data, Json::TYPE_ARRAY);
-
-        $this->assertArrayHasKey('graph_data', $data);
-        $this->assertArrayHasKey('sector', $data);
-        $this->assertArrayHasKey('totalActividades', $data);
-    }
-
-    public function testGetGasesDistributionActionCanBeAccessed()
-    {
-        $this->dispatch('/informe/distribucion-gases/2014', 'GET');
-        $this->assertResponseStatusCode(200);
-        $this->assertResponseHeaderContains('Content-Type', 'application/json; charset=utf-8');
-        $this->assertModuleName('api');
-        $this->assertControllerName(DistributionReportController::class);
-        $this->assertControllerClass('DistributionReportController');
-        $this->assertMatchedRouteName('informe-gas');
-
-        $data = $this->getResponse()->getContent();
-
-        $this->assertJson($data);
-
-        $data = Json::decode($data, Json::TYPE_ARRAY);
-
-        $this->assertArrayHasKey('colores', $data);
-        $this->assertArrayHasKey('gases', $data);
-        $this->assertArrayHasKey('valores', $data);
-    }
-
-    public function testGetSectoralGasesDistributionActionCanBeAccessed()
-    {
-        $this->dispatch('/informe/distribucion-gases-sector/2014', 'GET');
-        $this->assertResponseStatusCode(200);
-        $this->assertResponseHeaderContains('Content-Type', 'application/json; charset=utf-8');
-        $this->assertModuleName('api');
-        $this->assertControllerName(DistributionReportController::class);
-        $this->assertControllerClass('DistributionReportController');
-        $this->assertMatchedRouteName('informe-gas-por-sector');
-
-        $data = $this->getResponse()->getContent();
-
-        $this->assertJson($data);
-
-        $data = Json::decode($data, Json::TYPE_ARRAY);
-    }
-
-    public function testInvalidRouteDoesNotCrash()
-    {
-        $this->dispatch('/invalid/route', 'GET');
-        $this->assertResponseStatusCode(404);
-    }
-
-    // public function testInvalidHttpVerbDoesNotCrash()
-    // {
-    //     $this->dispatch('/informe/distribucion-sectores/2014', 'DELETE');
-    //     $this->assertResponseStatusCode(405);
-    // }
+	use TestCaseTrait;
+
+	private static $pdo = null;
+
+	private $conn = null;
+
+	public function setUp()
+	{
+		$configOverrides = [];
+
+		$this->setApplicationConfig(ArrayUtils::merge(
+			include __DIR__ . '/../../../../config/application.config.php',
+			$configOverrides
+		));
+
+		$services = $this->getApplicationServiceLocator();
+		$config = $services->get('config');
+		unset($config['db']);
+		$services->setAllowOverride(true);
+		$services->setService('config', $config);
+		$services->setAllowOverride(false);
+
+		parent::setUp();
+	}
+
+	final public function getConnection()
+	{
+		if ($this->conn === null) {
+			if (self::$pdo == null) {
+				self::$pdo = new PDO('sqlite::memory:');
+			}
+			$this->conn = $this->createDefaultDBConnection(self::$pdo, ':memory:');
+		}
+
+		return $this->conn;
+	}
+
+	protected function getDataSet()
+	{
+		return $this->createXMLDataSet(__DIR__ . '/../fixtures/database.xml');
+	}
+
+	public function testGetWholeSectoralDistributionActionActionCanBeAccessed()
+	{
+		$this->dispatch('/informe/distribucion-sectores/2014', 'GET');
+		$this->assertResponseStatusCode(200);
+		$this->assertResponseHeaderContains('Content-Type', 'application/json; charset=utf-8');
+		$this->assertModuleName('api');
+		$this->assertControllerName(DistributionReportController::class);
+		$this->assertControllerClass('DistributionReportController');
+		$this->assertMatchedRouteName('informe-todos-sectores');
+
+		$data = $this->getResponse()->getContent();
+
+		$this->assertJson($data);
+
+		$data = Json::decode($data, Json::TYPE_ARRAY);
+
+		$this->assertArrayHasKey('sector_1', $data);
+		$this->assertArrayHasKey('colores', $data);
+		$this->assertArrayHasKey('descripciones', $data);
+	}
+
+	public function testGetSectoralDistributionActionCanBeAccessed()
+	{
+		$this->dispatch('/informe/distribucion-sector/2014/1', 'GET');
+		$this->assertResponseStatusCode(200);
+		$this->assertResponseHeaderContains('Content-Type', 'application/json; charset=utf-8');
+		$this->assertModuleName('api');
+		$this->assertControllerName(DistributionReportController::class);
+		$this->assertControllerClass('DistributionReportController');
+		$this->assertMatchedRouteName('informe-por-sector');
+
+		$data = $this->getResponse()->getContent();
+
+		$this->assertJson($data);
+
+		$data = Json::decode($data, Json::TYPE_ARRAY);
+
+		$this->assertArrayHasKey('graph_data', $data);
+		$this->assertArrayHasKey('sector', $data);
+		$this->assertArrayHasKey('totalActividades', $data);
+	}
+
+	public function testGetGasesDistributionActionCanBeAccessed()
+	{
+		$this->dispatch('/informe/distribucion-gases/2014', 'GET');
+		$this->assertResponseStatusCode(200);
+		$this->assertResponseHeaderContains('Content-Type', 'application/json; charset=utf-8');
+		$this->assertModuleName('api');
+		$this->assertControllerName(DistributionReportController::class);
+		$this->assertControllerClass('DistributionReportController');
+		$this->assertMatchedRouteName('informe-gas');
+
+		$data = $this->getResponse()->getContent();
+
+		$this->assertJson($data);
+
+		$data = Json::decode($data, Json::TYPE_ARRAY);
+
+		$this->assertArrayHasKey('colores', $data);
+		$this->assertArrayHasKey('gases', $data);
+		$this->assertArrayHasKey('valores', $data);
+	}
+
+	public function testGetSectoralGasesDistributionActionCanBeAccessed()
+	{
+		$this->dispatch('/informe/distribucion-gases-sector/2014', 'GET');
+		$this->assertResponseStatusCode(200);
+		$this->assertResponseHeaderContains('Content-Type', 'application/json; charset=utf-8');
+		$this->assertModuleName('api');
+		$this->assertControllerName(DistributionReportController::class);
+		$this->assertControllerClass('DistributionReportController');
+		$this->assertMatchedRouteName('informe-gas-por-sector');
+
+		$data = $this->getResponse()->getContent();
+
+		$this->assertJson($data);
+
+		$data = Json::decode($data, Json::TYPE_ARRAY);
+	}
+
+	public function testInvalidRouteDoesNotCrash()
+	{
+		$this->dispatch('/invalid/route', 'GET');
+		$this->assertResponseStatusCode(404);
+	}
+
+	// public function testInvalidHttpVerbDoesNotCrash()
+	// {
+	//     $this->dispatch('/informe/distribucion-sectores/2014', 'DELETE');
+	//     $this->assertResponseStatusCode(405);
+	// }
 }

Spacing +2 added lines, -2 removed lines

@@ -27,7 +27,7 @@ 
         $configOverrides = [];
 
         $this->setApplicationConfig(ArrayUtils::merge(
-            include __DIR__ . '/../../../../config/application.config.php',
+            include __DIR__.'/../../../../config/application.config.php',
             $configOverrides
         ));
 
@@ -55,7 +55,7 @@ 
 
     protected function getDataSet()
     {
-        return $this->createXMLDataSet(__DIR__ . '/../fixtures/database.xml');
+        return $this->createXMLDataSet(__DIR__.'/../fixtures/database.xml');
     }
 
     public function testGetWholeSectoralDistributionActionActionCanBeAccessed()

module/Api/test/Controller/EvolutionReportControllerTest.php

Indentation +133 added lines, -133 removed lines

@@ -16,137 +16,137 @@
 
 class EvolutionReportControllerTest extends AbstractHttpControllerTestCase
 {
-    use TestCaseTrait;
-
-    private static $pdo = null;
-
-    private $conn = null;
-
-    public function setUp()
-    {
-        $configOverrides = [];
-
-        $this->setApplicationConfig(ArrayUtils::merge(
-            include __DIR__ . '/../../../../config/application.config.php',
-            $configOverrides
-        ));
-
-        $services = $this->getApplicationServiceLocator();
-        $config = $services->get('config');
-        unset($config['db']);
-        $services->setAllowOverride(true);
-        $services->setService('config', $config);
-        $services->setAllowOverride(false);
-
-        parent::setUp();
-    }
-
-    final public function getConnection()
-    {
-        if ($this->conn === null) {
-            if (self::$pdo == null) {
-                self::$pdo = new PDO('sqlite::memory:');
-            }
-            $this->conn = $this->createDefaultDBConnection(self::$pdo, ':memory:');
-        }
-
-        return $this->conn;
-    }
-
-    protected function getDataSet()
-    {
-        return $this->createXMLDataSet(__DIR__ . '/../fixtures/database.xml');
-    }
-
-    public function testGetWholeSectoralEvolutionActionCanBeAccessed()
-    {
-        $this->dispatch('/informe/evolucion-sectores', 'GET');
-        $this->assertResponseStatusCode(200);
-        $this->assertResponseHeaderContains('Content-Type', 'application/json; charset=utf-8');
-        $this->assertModuleName('api');
-        $this->assertControllerName(EvolutionReportController::class);
-        $this->assertControllerClass('EvolutionReportController');
-        $this->assertMatchedRouteName('informe-evolucion-sectores');
-
-        $data = $this->getResponse()->getContent();
-
-        $this->assertJson($data);
-
-        $data = Json::decode($data, Json::TYPE_ARRAY);
-
-        $this->assertArrayHasKey('column_1', $data);
-        $this->assertArrayHasKey('colores', $data);
-        $this->assertArrayHasKey('column_2', $data);
-    }
-
-    public function testGetSectoralEvolutionActionCanBeAccessed()
-    {
-        $this->dispatch('/informe/evolucion-sector/1', 'GET');
-        $this->assertResponseStatusCode(200);
-        $this->assertResponseHeaderContains('Content-Type', 'application/json; charset=utf-8');
-        $this->assertModuleName('api');
-        $this->assertControllerName(EvolutionReportController::class);
-        $this->assertControllerClass('EvolutionReportController');
-        $this->assertMatchedRouteName('informe-evolucion-sector');
-
-        $data = $this->getResponse()->getContent();
-
-        $this->assertJson($data);
-
-        $data = Json::decode($data, Json::TYPE_ARRAY);
-
-        $this->assertArrayHasKey('column_1', $data);
-        $this->assertArrayHasKey('colores', $data);
-        $this->assertArrayHasKey('column_2', $data);
-    }
-
-    public function testGetSectoralEvolutionSubactivityActionCanBeAccessed()
-    {
-        $this->dispatch('/informe/evolucion-sector-subactividad/2', 'GET');
-        $this->assertResponseStatusCode(200);
-        $this->assertResponseHeaderContains('Content-Type', 'application/json; charset=utf-8');
-        $this->assertModuleName('api');
-        $this->assertControllerName(EvolutionReportController::class);
-        $this->assertControllerClass('EvolutionReportController');
-        $this->assertMatchedRouteName('informe-evolucion-sector-subactividad');
-
-        $data = $this->getResponse()->getContent();
-
-        $this->assertJson($data);
-
-        $data = Json::decode($data, Json::TYPE_ARRAY);
-
-        $this->assertArrayHasKey('column_1', $data);
-        $this->assertArrayHasKey('groups', $data);
-        $this->assertArrayHasKey('column_3', $data);
-    }
-
-    public function testGetSectoralEvolutionSubactivityCategoryActionCanBeAccessed()
-    {
-        $this->dispatch('/informe/evolucion-sector-subactividad-categoria/1/2', 'GET');
-        $this->assertResponseStatusCode(200);
-        $this->assertResponseHeaderContains('Content-Type', 'application/json; charset=utf-8');
-        $this->assertModuleName('api');
-        $this->assertControllerName(EvolutionReportController::class);
-        $this->assertControllerClass('EvolutionReportController');
-        $this->assertMatchedRouteName('informe-evolucion-sector-subactividad-categoria');
-
-        $data = $this->getResponse()->getContent();
-
-        $this->assertJson($data);
-
-        $data = Json::decode($data, Json::TYPE_ARRAY);
-    }
-
-    public function testInvalidRouteDoesNotCrash()
-    {
-        $this->dispatch('/invalid/route', 'GET');
-        $this->assertResponseStatusCode(404);
-    }
-
-    // public function testInvalidHttpVerbDoesNotCrash()
-    // {
-    //     $this->dispatch('/informe/distribucion-sectores/2014', 'DELETE');
-    //     $this->assertResponseStatusCode(405);
-    // }
+	use TestCaseTrait;
+
+	private static $pdo = null;
+
+	private $conn = null;
+
+	public function setUp()
+	{
+		$configOverrides = [];
+
+		$this->setApplicationConfig(ArrayUtils::merge(
+			include __DIR__ . '/../../../../config/application.config.php',
+			$configOverrides
+		));
+
+		$services = $this->getApplicationServiceLocator();
+		$config = $services->get('config');
+		unset($config['db']);
+		$services->setAllowOverride(true);
+		$services->setService('config', $config);
+		$services->setAllowOverride(false);
+
+		parent::setUp();
+	}
+
+	final public function getConnection()
+	{
+		if ($this->conn === null) {
+			if (self::$pdo == null) {
+				self::$pdo = new PDO('sqlite::memory:');
+			}
+			$this->conn = $this->createDefaultDBConnection(self::$pdo, ':memory:');
+		}
+
+		return $this->conn;
+	}
+
+	protected function getDataSet()
+	{
+		return $this->createXMLDataSet(__DIR__ . '/../fixtures/database.xml');
+	}
+
+	public function testGetWholeSectoralEvolutionActionCanBeAccessed()
+	{
+		$this->dispatch('/informe/evolucion-sectores', 'GET');
+		$this->assertResponseStatusCode(200);
+		$this->assertResponseHeaderContains('Content-Type', 'application/json; charset=utf-8');
+		$this->assertModuleName('api');
+		$this->assertControllerName(EvolutionReportController::class);
+		$this->assertControllerClass('EvolutionReportController');
+		$this->assertMatchedRouteName('informe-evolucion-sectores');
+
+		$data = $this->getResponse()->getContent();
+
+		$this->assertJson($data);
+
+		$data = Json::decode($data, Json::TYPE_ARRAY);
+
+		$this->assertArrayHasKey('column_1', $data);
+		$this->assertArrayHasKey('colores', $data);
+		$this->assertArrayHasKey('column_2', $data);
+	}
+
+	public function testGetSectoralEvolutionActionCanBeAccessed()
+	{
+		$this->dispatch('/informe/evolucion-sector/1', 'GET');
+		$this->assertResponseStatusCode(200);
+		$this->assertResponseHeaderContains('Content-Type', 'application/json; charset=utf-8');
+		$this->assertModuleName('api');
+		$this->assertControllerName(EvolutionReportController::class);
+		$this->assertControllerClass('EvolutionReportController');
+		$this->assertMatchedRouteName('informe-evolucion-sector');
+
+		$data = $this->getResponse()->getContent();
+
+		$this->assertJson($data);
+
+		$data = Json::decode($data, Json::TYPE_ARRAY);
+
+		$this->assertArrayHasKey('column_1', $data);
+		$this->assertArrayHasKey('colores', $data);
+		$this->assertArrayHasKey('column_2', $data);
+	}
+
+	public function testGetSectoralEvolutionSubactivityActionCanBeAccessed()
+	{
+		$this->dispatch('/informe/evolucion-sector-subactividad/2', 'GET');
+		$this->assertResponseStatusCode(200);
+		$this->assertResponseHeaderContains('Content-Type', 'application/json; charset=utf-8');
+		$this->assertModuleName('api');
+		$this->assertControllerName(EvolutionReportController::class);
+		$this->assertControllerClass('EvolutionReportController');
+		$this->assertMatchedRouteName('informe-evolucion-sector-subactividad');
+
+		$data = $this->getResponse()->getContent();
+
+		$this->assertJson($data);
+
+		$data = Json::decode($data, Json::TYPE_ARRAY);
+
+		$this->assertArrayHasKey('column_1', $data);
+		$this->assertArrayHasKey('groups', $data);
+		$this->assertArrayHasKey('column_3', $data);
+	}
+
+	public function testGetSectoralEvolutionSubactivityCategoryActionCanBeAccessed()
+	{
+		$this->dispatch('/informe/evolucion-sector-subactividad-categoria/1/2', 'GET');
+		$this->assertResponseStatusCode(200);
+		$this->assertResponseHeaderContains('Content-Type', 'application/json; charset=utf-8');
+		$this->assertModuleName('api');
+		$this->assertControllerName(EvolutionReportController::class);
+		$this->assertControllerClass('EvolutionReportController');
+		$this->assertMatchedRouteName('informe-evolucion-sector-subactividad-categoria');
+
+		$data = $this->getResponse()->getContent();
+
+		$this->assertJson($data);
+
+		$data = Json::decode($data, Json::TYPE_ARRAY);
+	}
+
+	public function testInvalidRouteDoesNotCrash()
+	{
+		$this->dispatch('/invalid/route', 'GET');
+		$this->assertResponseStatusCode(404);
+	}
+
+	// public function testInvalidHttpVerbDoesNotCrash()
+	// {
+	//     $this->dispatch('/informe/distribucion-sectores/2014', 'DELETE');
+	//     $this->assertResponseStatusCode(405);
+	// }
 }

Spacing +2 added lines, -2 removed lines

@@ -27,7 +27,7 @@ 
         $configOverrides = [];
 
         $this->setApplicationConfig(ArrayUtils::merge(
-            include __DIR__ . '/../../../../config/application.config.php',
+            include __DIR__.'/../../../../config/application.config.php',
             $configOverrides
         ));
 
@@ -55,7 +55,7 @@ 
 
     protected function getDataSet()
     {
-        return $this->createXMLDataSet(__DIR__ . '/../fixtures/database.xml');
+        return $this->createXMLDataSet(__DIR__.'/../fixtures/database.xml');
     }
 
     public function testGetWholeSectoralEvolutionActionCanBeAccessed()