Skip to content
Snippets Groups Projects
Commit 37f87282 authored by Daniel Hürtgen's avatar Daniel Hürtgen
Browse files

TASK: Refactor class namespace to be more clearly

parent 1925bb2b
2 merge requests!37Release 0.4.0,!32Implement PHPCodeSniffer Standards Finder Service
Pipeline #140 passed with stage
in 2 minutes and 57 seconds
Hide whitespace changes
Inline Side-by-side
Showing
with 50 additions and 48 deletions
src/Installer.php
+ 2
− 2
View file @ 37f87282
......@@ -29,8 +29,8 @@ use Composer\Package\PackageInterface;
use Composer\Repository\InstalledRepositoryInterface;
use Composer\Util\Filesystem;
use Higidi\ComposerPhpCSStandardsPlugin\PHPCodeSniffer\Finder;
use Higidi\ComposerPhpCSStandardsPlugin\PHPCodeSniffer\Standard\Standard;
use Higidi\ComposerPhpCSStandardsPlugin\PHPCodeSniffer\Standards;
use Higidi\ComposerPhpCSStandardsPlugin\PHPCodeSniffer\Standards\Standard\Standard;
use Higidi\ComposerPhpCSStandardsPlugin\PHPCodeSniffer\Standards\Standards;
use Symfony\Component\Filesystem\Filesystem as SymfonyFilesystem;
class Installer extends LibraryInstaller
......
src/PHPCodeSniffer/Finder.php
+ 6
− 4
View file @ 37f87282
......@@ -21,6 +21,8 @@ namespace Higidi\ComposerPhpCSStandardsPlugin\PHPCodeSniffer;
* 02110-1301, USA.
*/
use Higidi\ComposerPhpCSStandardsPlugin\PHPCodeSniffer\Standards\Standards;
use Higidi\ComposerPhpCSStandardsPlugin\PHPCodeSniffer\Standards\Factory;
use Higidi\ComposerPhpCSStandardsPlugin\Symfony\Finder\Factory as FinderFactory;
use Symfony\Component\Finder\Finder as SymfonyFinder;
use Symfony\Component\Finder\SplFileInfo;
......@@ -36,18 +38,18 @@ class Finder
protected $finderFactory;
/**
* @var StandardsFactory
* @var Factory
*/
protected $factory;
/**
* @param FinderFactory|null $finderFactory
* @param StandardsFactory|null $factory
* @param Factory|null $factory
*/
public function __construct(FinderFactory $finderFactory = null, StandardsFactory $factory = null)
public function __construct(FinderFactory $finderFactory = null, Factory $factory = null)
{
$this->finderFactory = $finderFactory ?: new FinderFactory();
$this->factory = $factory ?: new StandardsFactory();
$this->factory = $factory ?: new Factory();
}
/**
......
src/PHPCodeSniffer/StandardsFactory.php → src/PHPCodeSniffer/Standards/Factory.php
+ 3
− 3
View file @ 37f87282
<?php
namespace Higidi\ComposerPhpCSStandardsPlugin\PHPCodeSniffer;
namespace Higidi\ComposerPhpCSStandardsPlugin\PHPCodeSniffer\Standards;
/*
* Copyright (C) 2017 Daniel Hürtgen <daniel@higidi.de>
......@@ -21,12 +21,12 @@ namespace Higidi\ComposerPhpCSStandardsPlugin\PHPCodeSniffer;
* 02110-1301, USA.
*/
use Higidi\ComposerPhpCSStandardsPlugin\PHPCodeSniffer\Standard\Factory as StandardFactory;
use Higidi\ComposerPhpCSStandardsPlugin\PHPCodeSniffer\Standards\Standard\Factory as StandardFactory;
/**
* Standards class factory.
*/
class StandardsFactory
class Factory
{
/**
* @var StandardFactory
......
src/PHPCodeSniffer/Standard/Exception/InvalidStandardException.php → src/PHPCodeSniffer/Standards/Standard/Exception/InvalidStandardException.php
+ 1
− 1
View file @ 37f87282
<?php
namespace Higidi\ComposerPhpCSStandardsPlugin\PHPCodeSniffer\Standard\Exception;
namespace Higidi\ComposerPhpCSStandardsPlugin\PHPCodeSniffer\Standards\Standard\Exception;
/*
* Copyright (C) 2017 Daniel Hürtgen <daniel@higidi.de>
......
src/PHPCodeSniffer/Standard/Exception/StandardPathAccessDeniedException.php → src/PHPCodeSniffer/Standards/Standard/Exception/StandardPathAccessDeniedException.php
+ 1
− 1
View file @ 37f87282
<?php
namespace Higidi\ComposerPhpCSStandardsPlugin\PHPCodeSniffer\Standard\Exception;
namespace Higidi\ComposerPhpCSStandardsPlugin\PHPCodeSniffer\Standards\Standard\Exception;
/*
* Copyright (C) 2017 Daniel Hürtgen <daniel@higidi.de>
......
src/PHPCodeSniffer/Standard/Factory.php → src/PHPCodeSniffer/Standards/Standard/Factory.php
+ 1
− 1
View file @ 37f87282
<?php
namespace Higidi\ComposerPhpCSStandardsPlugin\PHPCodeSniffer\Standard;
namespace Higidi\ComposerPhpCSStandardsPlugin\PHPCodeSniffer\Standards\Standard;
/*
* Copyright (C) 2017 Daniel Hürtgen <daniel@higidi.de>
......
src/PHPCodeSniffer/Standard/Standard.php → src/PHPCodeSniffer/Standards/Standard/Standard.php
+ 3
− 3
View file @ 37f87282
<?php
namespace Higidi\ComposerPhpCSStandardsPlugin\PHPCodeSniffer\Standard;
namespace Higidi\ComposerPhpCSStandardsPlugin\PHPCodeSniffer\Standards\Standard;
/*
* Copyright (C) 2017 Daniel Hürtgen <daniel@higidi.de>
......@@ -21,8 +21,8 @@ namespace Higidi\ComposerPhpCSStandardsPlugin\PHPCodeSniffer\Standard;
* 02110-1301, USA.
*/
use Higidi\ComposerPhpCSStandardsPlugin\PHPCodeSniffer\Standard\Exception\InvalidStandardException;
use Higidi\ComposerPhpCSStandardsPlugin\PHPCodeSniffer\Standard\Exception\StandardPathAccessDeniedException;
use Higidi\ComposerPhpCSStandardsPlugin\PHPCodeSniffer\Standards\Standard\Exception\InvalidStandardException;
use Higidi\ComposerPhpCSStandardsPlugin\PHPCodeSniffer\Standards\Standard\Exception\StandardPathAccessDeniedException;
/**
* Class for PHPCodeSniffer standards.
......
src/PHPCodeSniffer/Standard/StandardInterface.php → src/PHPCodeSniffer/Standards/Standard/StandardInterface.php
+ 1
− 1
View file @ 37f87282
<?php
namespace Higidi\ComposerPhpCSStandardsPlugin\PHPCodeSniffer\Standard;
namespace Higidi\ComposerPhpCSStandardsPlugin\PHPCodeSniffer\Standards\Standard;
/*
* Copyright (C) 2017 Daniel Hürtgen <daniel@higidi.de>
......
src/PHPCodeSniffer/Standards.php → src/PHPCodeSniffer/Standards/Standards.php
+ 2
− 2
View file @ 37f87282
<?php
namespace Higidi\ComposerPhpCSStandardsPlugin\PHPCodeSniffer;
namespace Higidi\ComposerPhpCSStandardsPlugin\PHPCodeSniffer\Standards;
/*
* Copyright (C) 2017 Daniel Hürtgen <daniel@higidi.de>
......@@ -21,7 +21,7 @@ namespace Higidi\ComposerPhpCSStandardsPlugin\PHPCodeSniffer;
* 02110-1301, USA.
*/
use Higidi\ComposerPhpCSStandardsPlugin\PHPCodeSniffer\Standard\StandardInterface;
use Higidi\ComposerPhpCSStandardsPlugin\PHPCodeSniffer\Standards\Standard\StandardInterface;
class Standards implements \Iterator
{
......
tests/src/Integration/PHPCodeSniffer/FinderTest.php
+ 3
− 3
View file @ 37f87282
......@@ -22,7 +22,7 @@ namespace Higidi\ComposerPhpCSStandardsPlugin\Tests\Integration\PHPCodeSniffer\S
*/
use Higidi\ComposerPhpCSStandardsPlugin\PHPCodeSniffer\Finder;
use Higidi\ComposerPhpCSStandardsPlugin\PHPCodeSniffer\StandardsFactory;
use Higidi\ComposerPhpCSStandardsPlugin\PHPCodeSniffer\Standards\Factory;
/**
* Integration test case for class \Higidi\ComposerPhpCSStandardsPlugin\PHPCodeSniffer\Finder
......@@ -35,7 +35,7 @@ class FinderTest extends \PHPUnit_Framework_TestCase
protected $fixture;
/**
* @var StandardsFactory|\PHPUnit_Framework_MockObject_MockObject
* @var Factory|\PHPUnit_Framework_MockObject_MockObject
*/
protected $standardsFactoryMock;
......@@ -43,7 +43,7 @@ class FinderTest extends \PHPUnit_Framework_TestCase
{
parent::setUp();
$this->standardsFactoryMock = $this->getMock(
'Higidi\ComposerPhpCSStandardsPlugin\PHPCodeSniffer\StandardsFactory',
'Higidi\ComposerPhpCSStandardsPlugin\PHPCodeSniffer\Standards\Factory',
array(),
array(),
'',
......
tests/src/Unit/PHPCodeSniffer/FinderTest.php
+ 4
− 4
View file @ 37f87282
<?php
namespace Higidi\ComposerPhpCSStandardsPlugin\Tests\Unit\PHPCodeSniffer\Standard;
namespace Higidi\ComposerPhpCSStandardsPlugin\Tests\Unit\PHPCodeSniffer\Standards\Standard;
/*
* Copyright (C) 2017 Daniel Hürtgen <daniel@higidi.de>
......@@ -22,7 +22,7 @@ namespace Higidi\ComposerPhpCSStandardsPlugin\Tests\Unit\PHPCodeSniffer\Standard
*/
use Higidi\ComposerPhpCSStandardsPlugin\PHPCodeSniffer\Finder;
use Higidi\ComposerPhpCSStandardsPlugin\PHPCodeSniffer\StandardsFactory;
use Higidi\ComposerPhpCSStandardsPlugin\PHPCodeSniffer\Standards\Factory;
use Higidi\ComposerPhpCSStandardsPlugin\Symfony\Finder\Factory as SymfonyFinderFactory;
use Symfony\Component\Finder\Finder as SymfonyFinder;
......@@ -47,7 +47,7 @@ class FinderTest extends \PHPUnit_Framework_TestCase
protected $symfonyFinderMock;
/**
* @var StandardsFactory|\PHPUnit_Framework_MockObject_MockObject
* @var Factory|\PHPUnit_Framework_MockObject_MockObject
*/
protected $standardsFactoryMock;
......@@ -62,7 +62,7 @@ class FinderTest extends \PHPUnit_Framework_TestCase
->method('create')
->willReturn($this->symfonyFinderMock);
$this->standardsFactoryMock = $this->getMock(
'Higidi\ComposerPhpCSStandardsPlugin\PHPCodeSniffer\StandardsFactory',
'Higidi\ComposerPhpCSStandardsPlugin\PHPCodeSniffer\Standards\Factory',
array(),
array(),
'',
......
tests/src/Unit/PHPCodeSniffer/StandardsFactoryTest.php → tests/src/Unit/PHPCodeSniffer/Standards/FactoryTest.php
+ 11
− 11
View file @ 37f87282
<?php
namespace Higidi\ComposerPhpCSStandardsPlugin\Tests\Unit\PHPCodeSniffer;
namespace Higidi\ComposerPhpCSStandardsPlugin\Tests\Unit\PHPCodeSniffer\Standards;
/*
* Copyright (C) 2017 Daniel Hürtgen <daniel@higidi.de>
......@@ -21,16 +21,16 @@ namespace Higidi\ComposerPhpCSStandardsPlugin\Tests\Unit\PHPCodeSniffer;
* 02110-1301, USA.
*/
use Higidi\ComposerPhpCSStandardsPlugin\PHPCodeSniffer\Standard\Factory as StandardFactory;
use Higidi\ComposerPhpCSStandardsPlugin\PHPCodeSniffer\StandardsFactory;
use Higidi\ComposerPhpCSStandardsPlugin\PHPCodeSniffer\Standards\Factory;
use Higidi\ComposerPhpCSStandardsPlugin\PHPCodeSniffer\Standards\Standard\Factory as StandardFactory;
/**
* Test case for class \Higidi\ComposerPhpCSStandardsPlugin\PHPCodeSniffer\StandardsFactory
* Test case for class \Higidi\ComposerPhpCSStandardsPlugin\PHPCodeSniffer\Standards\StandardsFactory
*/
class StandardsFactoryTest extends \PHPUnit_Framework_TestCase
class FactoryTest extends \PHPUnit_Framework_TestCase
{
/**
* @var StandardsFactory
* @var Factory
*/
protected $classUnderTesting;
......@@ -43,13 +43,13 @@ class StandardsFactoryTest extends \PHPUnit_Framework_TestCase
{
parent::setUp();
$this->standardFactoryMock = $this->getMock(
'Higidi\ComposerPhpCSStandardsPlugin\PHPCodeSniffer\Standard\Factory'
'Higidi\ComposerPhpCSStandardsPlugin\PHPCodeSniffer\Standards\Standard\Factory'
);
$this->standardFactoryMock
->method('create')
->willReturn(
$this->getMock(
'Higidi\ComposerPhpCSStandardsPlugin\PHPCodeSniffer\Standard\Standard',
'Higidi\ComposerPhpCSStandardsPlugin\PHPCodeSniffer\Standards\Standard\Standard',
array(),
array(),
'',
......@@ -57,7 +57,7 @@ class StandardsFactoryTest extends \PHPUnit_Framework_TestCase
)
);
$this->classUnderTesting = new StandardsFactory($this->standardFactoryMock);
$this->classUnderTesting = new Factory($this->standardFactoryMock);
}
protected function tearDown()
......@@ -72,7 +72,7 @@ class StandardsFactoryTest extends \PHPUnit_Framework_TestCase
$paths = array();
$paths[] = implode(
DIRECTORY_SEPARATOR,
array(__DIR__, '..', '..', '..', 'Fixtures', 'Standards', 'Standard1')
array(__DIR__, '..', '..', '..', '..', 'Fixtures', 'Standards', 'Standard1')
);
$this->standardFactoryMock
->expects($this->exactly(count($paths)))
......@@ -81,6 +81,6 @@ class StandardsFactoryTest extends \PHPUnit_Framework_TestCase
$standards = $this->classUnderTesting->create($paths);
$this->assertInstanceOf('Higidi\ComposerPhpCSStandardsPlugin\PHPCodeSniffer\Standards', $standards);
$this->assertInstanceOf('Higidi\ComposerPhpCSStandardsPlugin\PHPCodeSniffer\Standards\Standards', $standards);
}
}
tests/src/Unit/PHPCodeSniffer/Standard/FactoryTest.php → tests/src/Unit/PHPCodeSniffer/Standards/Standard/FactoryTest.php
+ 5
− 5
View file @ 37f87282
<?php
namespace Higidi\ComposerPhpCSStandardsPlugin\Tests\Unit\PHPCodeSniffer\Standard;
namespace Higidi\ComposerPhpCSStandardsPlugin\Tests\Unit\PHPCodeSniffer\Standards\Standard;
/*
* Copyright (C) 2017 Daniel Hürtgen <daniel@higidi.de>
......@@ -21,10 +21,10 @@ namespace Higidi\ComposerPhpCSStandardsPlugin\Tests\Unit\PHPCodeSniffer\Standard
* 02110-1301, USA.
*/
use Higidi\ComposerPhpCSStandardsPlugin\PHPCodeSniffer\Standard\Factory;
use Higidi\ComposerPhpCSStandardsPlugin\PHPCodeSniffer\Standards\Standard\Factory;
/**
* Test case for class \Higidi\ComposerPhpCSStandardsPlugin\PHPCodeSniffer\Standard\Factory
* Test case for class \Higidi\ComposerPhpCSStandardsPlugin\PHPCodeSniffer\Standards\Standard\Factory
*/
class FactoryTest extends \PHPUnit_Framework_TestCase
{
......@@ -49,10 +49,10 @@ class FactoryTest extends \PHPUnit_Framework_TestCase
{
$path = implode(
DIRECTORY_SEPARATOR,
array(__DIR__, '..', '..', '..', '..', 'Fixtures', 'Standards', 'Standard1')
array(__DIR__, '..', '..', '..', '..', '..', 'Fixtures', 'Standards', 'Standard1')
);
$standard = $this->classUnderTesting->create($path);
$this->assertInstanceOf('Higidi\ComposerPhpCSStandardsPlugin\PHPCodeSniffer\Standard\Standard', $standard);
$this->assertInstanceOf('Higidi\ComposerPhpCSStandardsPlugin\PHPCodeSniffer\Standards\Standard\Standard', $standard);
}
}
tests/src/Unit/PHPCodeSniffer/Standard/StandardTest.php → tests/src/Unit/PHPCodeSniffer/Standards/Standard/StandardTest.php
+ 7
− 7
View file @ 37f87282
<?php
namespace Higidi\ComposerPhpCSStandardsPlugin\Tests\Unit\PHPCodeSniffer\Standard;
namespace Higidi\ComposerPhpCSStandardsPlugin\Tests\Unit\PHPCodeSniffer\Standards\Standard;
/*
* Copyright (C) 2017 Daniel Hürtgen <daniel@higidi.de>
......@@ -21,10 +21,10 @@ namespace Higidi\ComposerPhpCSStandardsPlugin\Tests\Unit\PHPCodeSniffer\Standard
* 02110-1301, USA.
*/
use Higidi\ComposerPhpCSStandardsPlugin\PHPCodeSniffer\Standard\Standard;
use Higidi\ComposerPhpCSStandardsPlugin\PHPCodeSniffer\Standards\Standard\Standard;
/**
* Test case for class \Higidi\ComposerPhpCSStandardsPlugin\PHPCodeSniffer\Standard\Standard
* Test case for class \Higidi\ComposerPhpCSStandardsPlugin\PHPCodeSniffer\Standards\Standard\Standard
*/
class StandardTest extends \PHPUnit_Framework_TestCase
{
......@@ -33,7 +33,7 @@ class StandardTest extends \PHPUnit_Framework_TestCase
$name = 'Standard1';
$path = implode(
DIRECTORY_SEPARATOR,
array(__DIR__, '..', '..', '..', '..', 'Fixtures', 'Standards', $name)
array(__DIR__, '..', '..', '..', '..', '..', 'Fixtures', 'Standards', $name)
);
$ruleSetXmlPath = $path . DIRECTORY_SEPARATOR . 'ruleset.xml';
......@@ -53,7 +53,7 @@ class StandardTest extends \PHPUnit_Framework_TestCase
}
/**
* @expectedException \Higidi\ComposerPhpCSStandardsPlugin\PHPCodeSniffer\Standard\Exception\StandardPathAccessDeniedException
* @expectedException \Higidi\ComposerPhpCSStandardsPlugin\PHPCodeSniffer\Standards\Standard\Exception\StandardPathAccessDeniedException
*/
public function testIfStandardPathAccessDeniedExceptionIsThrown()
{
......@@ -61,13 +61,13 @@ class StandardTest extends \PHPUnit_Framework_TestCase
}
/**
* @expectedException \Higidi\ComposerPhpCSStandardsPlugin\PHPCodeSniffer\Standard\Exception\InvalidStandardException
* @expectedException \Higidi\ComposerPhpCSStandardsPlugin\PHPCodeSniffer\Standards\Standard\Exception\InvalidStandardException
*/
public function testIfInvalidStandardExceptionIsThrown()
{
$path = implode(
DIRECTORY_SEPARATOR,
array(__DIR__, '..', '..', '..', '..', 'Fixtures', 'Standards', 'InvalidStandard')
array(__DIR__, '..', '..', '..', '..', '..', 'Fixtures', 'Standards', 'InvalidStandard')
);
new Standard($path);
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment