Review directories structure

This commit is contained in:
Romain Neutron
2013-05-13 19:21:52 +02:00
parent 6bf9fcc70f
commit b5c58c99cf
21 changed files with 62 additions and 38 deletions

View File

@@ -9,7 +9,7 @@
* file that was distributed with this source code.
*/
namespace Alchemy\Phrasea\Setup\System;
namespace Alchemy\Phrasea\Setup;
class Information implements InformationInterface
{

View File

@@ -9,7 +9,7 @@
* file that was distributed with this source code.
*/
namespace Alchemy\Phrasea\Setup\System;
namespace Alchemy\Phrasea\Setup;
interface InformationInterface
{

View File

@@ -1,6 +1,6 @@
<?php
namespace Alchemy\Phrasea\Setup\System;
namespace Alchemy\Phrasea\Setup;
/**
* @see https://github.com/sensio/SensioDistributionBundle/blob/master/Resources/skeleton/app/SymfonyRequirements.php

View File

@@ -12,8 +12,11 @@
namespace Alchemy\Phrasea\Setup\Probe;
use Alchemy\Phrasea\Application;
use Alchemy\Phrasea\Setup\System\RequirementCollectionInterface;
use Alchemy\Phrasea\Setup\RequirementCollectionInterface;
/**
* A probe is used to probe the system when installed and configured.
*/
interface ProbeInterface extends RequirementCollectionInterface
{
/**

View File

@@ -12,7 +12,7 @@
namespace Alchemy\Phrasea\Setup\Probe;
use Alchemy\Phrasea\Application;
use Alchemy\Phrasea\Setup\System\RequirementCollection;
use Alchemy\Phrasea\Setup\RequirementCollection;
use Alchemy\Phrasea\SearchEngine\SearchEngineInterface;
class SearchEngineProbe extends RequirementCollection implements ProbeInterface

View File

@@ -1,6 +1,6 @@
<?php
namespace Alchemy\Phrasea\Setup\System;
namespace Alchemy\Phrasea\Setup;
/**
* @see https://github.com/sensio/SensioDistributionBundle/blob/master/Resources/skeleton/app/SymfonyRequirements.php

View File

@@ -1,6 +1,6 @@
<?php
namespace Alchemy\Phrasea\Setup\System;
namespace Alchemy\Phrasea\Setup;
/**
* @see https://github.com/sensio/SensioDistributionBundle/blob/master/Resources/skeleton/app/SymfonyRequirements.php

View File

@@ -1,6 +1,6 @@
<?php
namespace Alchemy\Phrasea\Setup\System;
namespace Alchemy\Phrasea\Setup;
/**
* @see https://github.com/sensio/SensioDistributionBundle/blob/master/Resources/skeleton/app/SymfonyRequirements.php

View File

@@ -9,7 +9,7 @@
* file that was distributed with this source code.
*/
namespace Alchemy\Phrasea\Setup\System;
namespace Alchemy\Phrasea\Setup;
interface RequirementInterface
{

View File

@@ -11,10 +11,10 @@
namespace Alchemy\Phrasea\Setup\Requirements;
use Alchemy\Phrasea\Setup\System\RequirementCollection;
use Alchemy\Phrasea\Setup\RequirementCollection;
use Symfony\Component\Process\ExecutableFinder;
class BinariesRequirements extends RequirementCollection
class BinariesRequirements extends RequirementCollection implements RequirementInterface
{
const FILE_VERSION = '5.04';
const IMAGICK_VERSION = '6.2.9';

View File

@@ -11,9 +11,9 @@
namespace Alchemy\Phrasea\Setup\Requirements;
use Alchemy\Phrasea\Setup\System\RequirementCollection;
use Alchemy\Phrasea\Setup\RequirementCollection;
class CacheServerRequirement extends RequirementCollection
class CacheServerRequirement extends RequirementCollection implements RequirementInterface
{
public function __construct()
{

View File

@@ -11,9 +11,9 @@
namespace Alchemy\Phrasea\Setup\Requirements;
use Alchemy\Phrasea\Setup\System\RequirementCollection;
use Alchemy\Phrasea\Setup\RequirementCollection;
class FilesystemRequirements extends RequirementCollection
class FilesystemRequirements extends RequirementCollection implements RequirementInterface
{
public function __construct()
{

View File

@@ -11,10 +11,10 @@
namespace Alchemy\Phrasea\Setup\Requirements;
use Alchemy\Phrasea\Setup\System\RequirementCollection;
use Alchemy\Phrasea\Setup\RequirementCollection;
use Alchemy\Phrasea\Application as PhraseaApplication;
class LocalesRequirements extends RequirementCollection
class LocalesRequirements extends RequirementCollection implements RequirementInterface
{
public function __construct($locale = 'en_GB')
{

View File

@@ -11,9 +11,9 @@
namespace Alchemy\Phrasea\Setup\Requirements;
use Alchemy\Phrasea\Setup\System\RequirementCollection;
use Alchemy\Phrasea\Setup\RequirementCollection;
class OpcodeCacheRequirement extends RequirementCollection
class OpcodeCacheRequirement extends RequirementCollection implements RequirementInterface
{
public function __construct()
{

View File

@@ -11,9 +11,9 @@
namespace Alchemy\Phrasea\Setup\Requirements;
use Alchemy\Phrasea\Setup\System\RequirementCollection;
use Alchemy\Phrasea\Setup\RequirementCollection;
class PhpRequirements extends RequirementCollection
class PhpRequirements extends RequirementCollection implements RequirementInterface
{
public function __construct()
{

View File

@@ -11,10 +11,10 @@
namespace Alchemy\Phrasea\Setup\Requirements;
use Alchemy\Phrasea\Setup\System\RequirementCollection;
use Alchemy\Phrasea\Setup\RequirementCollection;
use Symfony\Component\Process\ExecutableFinder;
class PhraseaRequirements extends RequirementCollection
class PhraseaRequirements extends RequirementCollection implements RequirementInterface
{
const PHRASEA_EXTENSION_VERSION = '1.21.1.0';
const PHRASEA_INDEXER_VERSION = '3.10.2.3';

View File

@@ -0,0 +1,21 @@
<?php
/*
* This file is part of Phraseanet
*
* (c) 2005-2013 Alchemy
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
*/
namespace Alchemy\Phrasea\Setup\Requirements;
use Alchemy\Phrasea\Setup\RequirementCollectionInterface;
/**
* A requirement is used to analyze the system even if Phraseanet is not installed
*/
interface RequirementInterface extends RequirementCollectionInterface
{
}

View File

@@ -11,9 +11,9 @@
namespace Alchemy\Phrasea\Setup\Requirements;
use Alchemy\Phrasea\Setup\System\RequirementCollection;
use Alchemy\Phrasea\Setup\RequirementCollection;
class SystemRequirements extends RequirementCollection
class SystemRequirements extends RequirementCollection implements RequirementInterface
{
const REQUIRED_PHP_VERSION = '5.3.3';

View File

@@ -150,7 +150,7 @@ class ConfigurationTesterTest extends AbstractSetupTester
public function testGetRequirements()
{
foreach ($this->getTester()->getRequirements() as $requirements) {
$this->assertInstanceOf('Alchemy\Phrasea\Setup\System\RequirementCollectionInterface', $requirements);
$this->assertInstanceOf('Alchemy\Phrasea\Setup\RequirementCollectionInterface', $requirements);
}
}

View File

@@ -23,7 +23,7 @@ abstract class ProbeTestCase extends \PhraseanetPHPUnitAbstract
$this->assertInternalType('array', $this->getProbe()->getRecommendations());
foreach ($this->getProbe()->getRecommendations() as $recommandation) {
$this->assertInstanceOf('Alchemy\Phrasea\Setup\System\RequirementInterface', $recommandation);
$this->assertInstanceOf('Alchemy\Phrasea\Setup\RequirementInterface', $recommandation);
}
}
@@ -32,7 +32,7 @@ abstract class ProbeTestCase extends \PhraseanetPHPUnitAbstract
$this->assertInternalType('array', $this->getProbe()->getRequirements());
foreach ($this->getProbe()->getRequirements() as $requirement) {
$this->assertInstanceOf('Alchemy\Phrasea\Setup\System\RequirementInterface', $requirement);
$this->assertInstanceOf('Alchemy\Phrasea\Setup\RequirementInterface', $requirement);
}
}
@@ -41,7 +41,7 @@ abstract class ProbeTestCase extends \PhraseanetPHPUnitAbstract
$this->assertInternalType('array', $this->getProbe()->getInformations());
foreach ($this->getProbe()->getInformations() as $information) {
$this->assertInstanceOf('Alchemy\Phrasea\Setup\System\InformationInterface', $information);
$this->assertInstanceOf('Alchemy\Phrasea\Setup\InformationInterface', $information);
}
}
}

View File

@@ -2,8 +2,8 @@
namespace Alchemy\Tests\Phrasea\Setup\Requirements;
use Alchemy\Phrasea\Setup\System\RequirementCollection;
use Alchemy\Phrasea\Setup\System\RequirementCollectionInterface;
use Alchemy\Phrasea\Setup\RequirementCollection;
use Alchemy\Phrasea\Setup\RequirementCollectionInterface;
abstract class RequirementsTestCase extends \PHPUnit_Framework_TestCase
{
@@ -14,13 +14,13 @@ abstract class RequirementsTestCase extends \PHPUnit_Framework_TestCase
public function testIsInterface()
{
$this->assertInstanceOf('Alchemy\Phrasea\Setup\System\RequirementCollectionInterface', $this->provideRequirements());
$this->assertInstanceOf('Alchemy\Phrasea\Setup\RequirementCollectionInterface', $this->provideRequirements());
}
public function testAdd()
{
$collection = $this->provideRequirements();
$requirement = $this->getMock('Alchemy\Phrasea\Setup\System\RequirementInterface');
$requirement = $this->getMock('Alchemy\Phrasea\Setup\RequirementInterface');
$collection->add($requirement);
$found = false;
@@ -39,7 +39,7 @@ abstract class RequirementsTestCase extends \PHPUnit_Framework_TestCase
{
$collection = $this->provideRequirements();
$requirement = $this->getMock('Alchemy\Phrasea\Setup\System\RequirementInterface');
$requirement = $this->getMock('Alchemy\Phrasea\Setup\RequirementInterface');
$coll = new RequirementCollection();
$coll->add($requirement);
@@ -64,7 +64,7 @@ abstract class RequirementsTestCase extends \PHPUnit_Framework_TestCase
$this->assertInternalType('array', $collection->all());
foreach ($collection->all() as $requirement) {
$this->assertInstanceOf('Alchemy\Phrasea\Setup\System\RequirementInterface', $requirement);
$this->assertInstanceOf('Alchemy\Phrasea\Setup\RequirementInterface', $requirement);
}
}
@@ -75,7 +75,7 @@ abstract class RequirementsTestCase extends \PHPUnit_Framework_TestCase
$this->assertInternalType('array', $collection->getFailedRecommendations());
foreach ($collection->getFailedRecommendations() as $requirement) {
$this->assertInstanceOf('Alchemy\Phrasea\Setup\System\RequirementInterface', $requirement);
$this->assertInstanceOf('Alchemy\Phrasea\Setup\RequirementInterface', $requirement);
}
}
@@ -86,7 +86,7 @@ abstract class RequirementsTestCase extends \PHPUnit_Framework_TestCase
$this->assertInternalType('array', $collection->getFailedRequirements());
foreach ($collection->getFailedRequirements() as $requirement) {
$this->assertInstanceOf('Alchemy\Phrasea\Setup\System\RequirementInterface', $requirement);
$this->assertInstanceOf('Alchemy\Phrasea\Setup\RequirementInterface', $requirement);
}
}
@@ -97,7 +97,7 @@ abstract class RequirementsTestCase extends \PHPUnit_Framework_TestCase
$this->assertInternalType('array', $collection->getInformations());
foreach ($collection->getInformations() as $requirement) {
$this->assertInstanceOf('Alchemy\Phrasea\Setup\System\InformationInterface', $requirement);
$this->assertInstanceOf('Alchemy\Phrasea\Setup\InformationInterface', $requirement);
}
}