From 1d37d708c462b0cee02226cbd72616a045e81979 Mon Sep 17 00:00:00 2001 From: Gregor Harlan Date: Thu, 11 Feb 2016 19:12:13 +0100 Subject: [PATCH 1/6] update travis.yml --- .travis.yml | 39 ++++++++++++++++++--------------------- 1 file changed, 18 insertions(+), 21 deletions(-) diff --git a/.travis.yml b/.travis.yml index 26d411c..b16db99 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,38 +1,35 @@ +sudo: false + language: php php: - - 5.4 - 5.5 - 5.6 - 7.0 - hhvm +cache: + directories: + - $HOME/.composer/cache/files + env: - - SYMFONY_VERSION="~2.5.0" - - SYMFONY_VERSION="~2.6.0" - - SYMFONY_VERSION="~2.7.0" - - SYMFONY_VERSION="~2.8.0" - - SYMFONY_VERSION="~3.0.0" - - SYMFONY_VERSION="dev-master" + - COMPOSER_FLAGS="--prefer-lowest" + - SYMFONY_VERSION="^2.8.2" + - SYMFONY_VERSION="^2.8.2" COMPOSER_FLAGS="--prefer-lowest" matrix: fast_finish: true + allow_failures: - php: hhvm - - env: SYMFONY_VERSION="~3.0.0" - - env: SYMFONY_VERSION="dev-master" - exclude: - # Symfony 3.x requires PHP 5.5 - - php: 5.4 - env: SYMFONY_VERSION="~3.0.0" - - php: 5.4 - env: SYMFONY_VERSION="dev-master" -sudo: false +before_install: + - phpenv config-rm xdebug.ini + - composer self-update + - if [ "${SYMFONY_VERSION}" != "" ]; then composer require --no-update "symfony/symfony:${SYMFONY_VERSION}"; fi; -before_script: - - curl -s http://getcomposer.org/installer | php - - php composer.phar require --no-update symfony/symfony:${SYMFONY_VERSION} - - php composer.phar install --prefer-source +install: + - composer update ${COMPOSER_FLAGS} --prefer-source -script: ./vendor/bin/phpunit --coverage-text +script: + - vendor/bin/phpunit --colors From 4aa5244f67c373df5372f49b5f67360facbcac81 Mon Sep 17 00:00:00 2001 From: Gregor Harlan Date: Thu, 11 Feb 2016 19:13:30 +0100 Subject: [PATCH 2/6] update composer.json --- composer.json | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/composer.json b/composer.json index de106e4..d39994b 100644 --- a/composer.json +++ b/composer.json @@ -8,16 +8,19 @@ "name": "William Durand", "email": "william.durand1@gmail.com" }], + + "autoload": { + "psr-4": { "Propel\\PropelBundle\\": "" }, + "exclude-from-classmap": [ "Tests/" ] + }, + "require": { - "symfony/symfony": "~2.5", - "propel/propel": "2.*@dev" + "propel/propel": "2.*@dev", + "symfony/symfony": "^2.8" }, "require-dev": { - "sensio/framework-extra-bundle": "~3.0", - "phpunit/phpunit": "~4.0", - "fzaninotto/faker": "~1.1" - }, - "autoload": { - "psr-4": { "Propel\\PropelBundle\\": "" } + "phpunit/phpunit": "^4.8.21|^5.0.10", + "sensio/framework-extra-bundle": "^3.0.2", + "fzaninotto/faker": "^1.5" } } From 893c85c655eafa274c05c39f14c63a313c7c4793 Mon Sep 17 00:00:00 2001 From: Gregor Harlan Date: Thu, 11 Feb 2016 19:14:03 +0100 Subject: [PATCH 3/6] introduce "Bundle" namespace part --- Command/AbstractCommand.php | 2 +- Command/AclInitCommand.php | 2 +- Command/BuildCommand.php | 2 +- Command/DatabaseCreateCommand.php | 2 +- Command/DatabaseDropCommand.php | 2 +- Command/DatabaseReverseCommand.php | 2 +- Command/FixturesDumpCommand.php | 2 +- Command/FixturesLoadCommand.php | 2 +- Command/FormGenerateCommand.php | 2 +- Command/FormattingHelpers.php | 2 +- Command/GraphvizGenerateCommand.php | 2 +- Command/MigrationDiffCommand.php | 2 +- Command/MigrationDownCommand.php | 2 +- Command/MigrationMigrateCommand.php | 2 +- Command/MigrationStatusCommand.php | 2 +- Command/MigrationUpCommand.php | 2 +- Command/ModelBuildCommand.php | 2 +- Command/SqlBuildCommand.php | 2 +- Command/SqlInsertCommand.php | 2 +- Command/TableDropCommand.php | 2 +- Command/WrappedCommand.php | 2 +- Controller/PanelController.php | 2 +- DataCollector/PropelDataCollector.php | 4 +- DataFixtures/AbstractDataHandler.php | 2 +- DataFixtures/Dumper/AbstractDataDumper.php | 4 +- DataFixtures/Dumper/DataDumperInterface.php | 2 +- DataFixtures/Dumper/YamlDataDumper.php | 2 +- DataFixtures/Loader/AbstractDataLoader.php | 6 +- DataFixtures/Loader/DataLoaderInterface.php | 2 +- DataFixtures/Loader/XmlDataLoader.php | 2 +- DataFixtures/Loader/YamlDataLoader.php | 2 +- DependencyInjection/Configuration.php | 2 +- DependencyInjection/PropelExtension.php | 2 +- .../Security/UserProvider/PropelFactory.php | 4 +- Form/BaseAbstractType.php | 2 +- Form/ChoiceList/ModelChoiceList.php | 4 +- .../CollectionToArrayTransformer.php | 2 +- .../TranslationCollectionFormListener.php | 2 +- .../EventListener/TranslationFormListener.php | 2 +- Form/PropelExtension.php | 2 +- Form/Type/ModelType.php | 6 +- Form/Type/TranslationCollectionType.php | 4 +- Form/Type/TranslationType.php | 4 +- Form/TypeGuesser.php | 2 +- Logger/PropelLogger.php | 2 +- Model/Acl/AclClass.php | 6 +- Model/Acl/AclClassQuery.php | 4 +- Model/Acl/Entry.php | 12 +- Model/Acl/EntryQuery.php | 8 +- Model/Acl/ObjectIdentity.php | 8 +- Model/Acl/ObjectIdentityAncestor.php | 4 +- Model/Acl/ObjectIdentityAncestorQuery.php | 4 +- Model/Acl/ObjectIdentityQuery.php | 16 +-- Model/Acl/SecurityIdentity.php | 8 +- Model/Acl/SecurityIdentityQuery.php | 4 +- PropelBundle.php | 4 +- .../ParamConverter/PropelParamConverter.php | 4 +- Resources/acl_schema.xml | 2 +- Resources/config/converters.xml | 2 +- Resources/config/propel.xml | 18 +-- Resources/config/security.xml | 4 +- Resources/skeleton/FormType.php | 2 +- Resources/views/Collector/propel.html.twig | 2 +- Security/Acl/AclProvider.php | 12 +- Security/Acl/AuditableAclProvider.php | 6 +- Security/Acl/Domain/Acl.php | 8 +- Security/Acl/Domain/AuditableAcl.php | 6 +- Security/Acl/Domain/Entry.php | 10 +- Security/Acl/Domain/FieldEntry.php | 8 +- Security/Acl/Domain/MutableAcl.php | 34 ++--- Security/Acl/MutableAclProvider.php | 34 ++--- Security/User/PropelUserProvider.php | 2 +- Service/SchemaLocator.php | 2 +- Tests/AclTestCase.php | 16 +-- .../Dumper/YamlDataDumperTest.php | 14 +- .../DataFixtures/Loader/XmlDataLoaderTest.php | 14 +- .../Loader/YamlDataLoaderTest.php | 128 +++++++++--------- Tests/DataFixtures/TestCase.php | 8 +- Tests/Fixtures/Acl/ArrayCache.php | 2 +- Tests/Fixtures/Column.php | 2 +- Tests/Fixtures/Item.php | 2 +- Tests/Fixtures/ItemQuery.php | 2 +- Tests/Fixtures/Model/Base/Book.php | 8 +- Tests/Fixtures/Model/Base/BookQuery.php | 14 +- Tests/Fixtures/Model/Book.php | 4 +- Tests/Fixtures/Model/BookQuery.php | 6 +- Tests/Fixtures/Model/Map/BookTableMap.php | 6 +- Tests/Fixtures/Model/User.php | 4 +- Tests/Fixtures/ReadOnlyItem.php | 2 +- Tests/Fixtures/ReadOnlyItemQuery.php | 2 +- Tests/Fixtures/TranslatableItem.php | 2 +- Tests/Fixtures/TranslatableItemI18n.php | 2 +- Tests/Form/ChoiceList/ModelChoiceListTest.php | 14 +- .../CollectionToArrayTransformerTest.php | 6 +- .../Type/TranslationCollectionTypeTest.php | 16 +-- Tests/Form/TypeGuesserTest.php | 10 +- Tests/Model/AclClassTest.php | 12 +- Tests/Model/EntryQueryTest.php | 10 +- Tests/Model/EntryTest.php | 20 +-- Tests/Model/ObjectIdentityQueryTest.php | 20 +-- Tests/Model/ObjectIdentityTest.php | 10 +- Tests/Model/SecurityIdentityTest.php | 24 ++-- .../PropelParamConverterTest.php | 100 +++++++------- Tests/Security/Acl/AclProviderTest.php | 20 +-- .../Security/Acl/AuditableAclProviderTest.php | 10 +- Tests/Security/Acl/Domain/AclTest.php | 38 +++--- .../Security/Acl/Domain/AuditableAclTest.php | 24 ++-- Tests/Security/Acl/Domain/EntryTest.php | 14 +- Tests/Security/Acl/Domain/FieldEntryTest.php | 14 +- Tests/Security/Acl/Domain/MutableAclTest.php | 20 +-- Tests/Security/Acl/MutableAclProviderTest.php | 18 +-- .../Security/User/PropelUserProviderTest.php | 12 +- Tests/TestCase.php | 2 +- Tests/Util/PropelInflectorTest.php | 6 +- Twig/Extension/SyntaxExtension.php | 2 +- Util/PropelInflector.php | 2 +- Validator/Constraints/UniqueObject.php | 2 +- .../Constraints/UniqueObjectValidator.php | 2 +- composer.json | 2 +- 119 files changed, 506 insertions(+), 506 deletions(-) diff --git a/Command/AbstractCommand.php b/Command/AbstractCommand.php index 98f1e94..a470c3c 100644 --- a/Command/AbstractCommand.php +++ b/Command/AbstractCommand.php @@ -8,7 +8,7 @@ * @license MIT License */ -namespace Propel\PropelBundle\Command; +namespace Propel\Bundle\PropelBundle\Command; use Symfony\Bundle\FrameworkBundle\Command\ContainerAwareCommand; use Symfony\Component\Console\Command\Command; diff --git a/Command/AclInitCommand.php b/Command/AclInitCommand.php index 32708b0..1c5e043 100644 --- a/Command/AclInitCommand.php +++ b/Command/AclInitCommand.php @@ -8,7 +8,7 @@ * @license MIT License */ -namespace Propel\PropelBundle\Command; +namespace Propel\Bundle\PropelBundle\Command; use Symfony\Component\Console\Input\InputOption; use Symfony\Component\Console\Input\InputInterface; diff --git a/Command/BuildCommand.php b/Command/BuildCommand.php index 85f7269..c69b233 100644 --- a/Command/BuildCommand.php +++ b/Command/BuildCommand.php @@ -8,7 +8,7 @@ * @license MIT License */ -namespace Propel\PropelBundle\Command; +namespace Propel\Bundle\PropelBundle\Command; use Symfony\Bundle\FrameworkBundle\Command\ContainerAwareCommand; use Symfony\Component\Console\Input\ArrayInput; diff --git a/Command/DatabaseCreateCommand.php b/Command/DatabaseCreateCommand.php index f383246..b9c739c 100644 --- a/Command/DatabaseCreateCommand.php +++ b/Command/DatabaseCreateCommand.php @@ -8,7 +8,7 @@ * @license MIT License */ -namespace Propel\PropelBundle\Command; +namespace Propel\Bundle\PropelBundle\Command; use Propel\Runtime\Connection\ConnectionManagerSingle; use Propel\Runtime\Propel; diff --git a/Command/DatabaseDropCommand.php b/Command/DatabaseDropCommand.php index 4e859e8..2c645b2 100644 --- a/Command/DatabaseDropCommand.php +++ b/Command/DatabaseDropCommand.php @@ -8,7 +8,7 @@ * @license MIT License */ -namespace Propel\PropelBundle\Command; +namespace Propel\Bundle\PropelBundle\Command; use Propel\Runtime\Propel; use Symfony\Component\Console\Input\InputInterface; diff --git a/Command/DatabaseReverseCommand.php b/Command/DatabaseReverseCommand.php index e2d1b48..1181eb9 100644 --- a/Command/DatabaseReverseCommand.php +++ b/Command/DatabaseReverseCommand.php @@ -8,7 +8,7 @@ * @license MIT License */ -namespace Propel\PropelBundle\Command; +namespace Propel\Bundle\PropelBundle\Command; use Symfony\Component\Console\Input\InputArgument; use Symfony\Component\Console\Input\InputOption; diff --git a/Command/FixturesDumpCommand.php b/Command/FixturesDumpCommand.php index c41a71c..ab855dc 100644 --- a/Command/FixturesDumpCommand.php +++ b/Command/FixturesDumpCommand.php @@ -8,7 +8,7 @@ * @license MIT License */ -namespace Propel\PropelBundle\Command; +namespace Propel\Bundle\PropelBundle\Command; use Symfony\Component\Console\Input\InputOption; use Symfony\Component\Console\Input\InputInterface; diff --git a/Command/FixturesLoadCommand.php b/Command/FixturesLoadCommand.php index 71d43ef..9e4ec1b 100644 --- a/Command/FixturesLoadCommand.php +++ b/Command/FixturesLoadCommand.php @@ -8,7 +8,7 @@ * @license MIT License */ -namespace Propel\PropelBundle\Command; +namespace Propel\Bundle\PropelBundle\Command; use Symfony\Component\Console\Input\ArrayInput; use Symfony\Component\Console\Input\InputOption; diff --git a/Command/FormGenerateCommand.php b/Command/FormGenerateCommand.php index 5fc7d84..46f68c9 100644 --- a/Command/FormGenerateCommand.php +++ b/Command/FormGenerateCommand.php @@ -8,7 +8,7 @@ * @license MIT License */ -namespace Propel\PropelBundle\Command; +namespace Propel\Bundle\PropelBundle\Command; use Propel\Generator\Config\GeneratorConfig; use Propel\Generator\Command\ModelBuildCommand as BaseModelBuildCommand; diff --git a/Command/FormattingHelpers.php b/Command/FormattingHelpers.php index 8de3d41..9dfdb2e 100644 --- a/Command/FormattingHelpers.php +++ b/Command/FormattingHelpers.php @@ -8,7 +8,7 @@ * @license MIT License */ -namespace Propel\PropelBundle\Command; +namespace Propel\Bundle\PropelBundle\Command; use Symfony\Component\Console\Output\OutputInterface; diff --git a/Command/GraphvizGenerateCommand.php b/Command/GraphvizGenerateCommand.php index 693f346..3ca0231 100644 --- a/Command/GraphvizGenerateCommand.php +++ b/Command/GraphvizGenerateCommand.php @@ -8,7 +8,7 @@ * @license MIT License */ -namespace Propel\PropelBundle\Command; +namespace Propel\Bundle\PropelBundle\Command; use Symfony\Component\Console\Input\InputOption; use Symfony\Component\Console\Input\InputInterface; diff --git a/Command/MigrationDiffCommand.php b/Command/MigrationDiffCommand.php index 0bdb09a..d72c3bf 100644 --- a/Command/MigrationDiffCommand.php +++ b/Command/MigrationDiffCommand.php @@ -8,7 +8,7 @@ * @license MIT License */ -namespace Propel\PropelBundle\Command; +namespace Propel\Bundle\PropelBundle\Command; use Symfony\Component\Console\Input\InputOption; use Symfony\Component\Console\Input\InputInterface; diff --git a/Command/MigrationDownCommand.php b/Command/MigrationDownCommand.php index d04d0f8..ba85b95 100644 --- a/Command/MigrationDownCommand.php +++ b/Command/MigrationDownCommand.php @@ -8,7 +8,7 @@ * @license MIT License */ -namespace Propel\PropelBundle\Command; +namespace Propel\Bundle\PropelBundle\Command; use Symfony\Component\Console\Input\InputOption; use Symfony\Component\Console\Input\InputInterface; diff --git a/Command/MigrationMigrateCommand.php b/Command/MigrationMigrateCommand.php index 317ef67..0d475b3 100644 --- a/Command/MigrationMigrateCommand.php +++ b/Command/MigrationMigrateCommand.php @@ -8,7 +8,7 @@ * @license MIT License */ -namespace Propel\PropelBundle\Command; +namespace Propel\Bundle\PropelBundle\Command; use Symfony\Component\Console\Input\InputOption; use Symfony\Component\Console\Input\InputInterface; diff --git a/Command/MigrationStatusCommand.php b/Command/MigrationStatusCommand.php index 68c9eeb..a6b5c07 100644 --- a/Command/MigrationStatusCommand.php +++ b/Command/MigrationStatusCommand.php @@ -8,7 +8,7 @@ * @license MIT License */ -namespace Propel\PropelBundle\Command; +namespace Propel\Bundle\PropelBundle\Command; use Symfony\Component\Console\Input\InputOption; use Symfony\Component\Console\Input\InputInterface; diff --git a/Command/MigrationUpCommand.php b/Command/MigrationUpCommand.php index 3423275..546c31c 100644 --- a/Command/MigrationUpCommand.php +++ b/Command/MigrationUpCommand.php @@ -8,7 +8,7 @@ * @license MIT License */ -namespace Propel\PropelBundle\Command; +namespace Propel\Bundle\PropelBundle\Command; use Symfony\Component\Console\Input\InputOption; use Symfony\Component\Console\Input\InputInterface; diff --git a/Command/ModelBuildCommand.php b/Command/ModelBuildCommand.php index 5389000..bf741f2 100644 --- a/Command/ModelBuildCommand.php +++ b/Command/ModelBuildCommand.php @@ -8,7 +8,7 @@ * @license MIT License */ -namespace Propel\PropelBundle\Command; +namespace Propel\Bundle\PropelBundle\Command; use Symfony\Component\Console\Input\InputArgument; use Symfony\Component\Console\Input\InputOption; diff --git a/Command/SqlBuildCommand.php b/Command/SqlBuildCommand.php index 0653f23..0a07fa1 100644 --- a/Command/SqlBuildCommand.php +++ b/Command/SqlBuildCommand.php @@ -8,7 +8,7 @@ * @license MIT License */ -namespace Propel\PropelBundle\Command; +namespace Propel\Bundle\PropelBundle\Command; use Symfony\Component\Console\Input\InputOption; use Symfony\Component\Console\Input\InputInterface; diff --git a/Command/SqlInsertCommand.php b/Command/SqlInsertCommand.php index 081ae0f..564ef52 100644 --- a/Command/SqlInsertCommand.php +++ b/Command/SqlInsertCommand.php @@ -8,7 +8,7 @@ * @license MIT License */ -namespace Propel\PropelBundle\Command; +namespace Propel\Bundle\PropelBundle\Command; use Symfony\Component\Console\Input\InputOption; use Symfony\Component\Console\Input\InputInterface; diff --git a/Command/TableDropCommand.php b/Command/TableDropCommand.php index c5c6c22..dab8d4c 100644 --- a/Command/TableDropCommand.php +++ b/Command/TableDropCommand.php @@ -8,7 +8,7 @@ * @license MIT License */ -namespace Propel\PropelBundle\Command; +namespace Propel\Bundle\PropelBundle\Command; use Propel\Runtime\Adapter\Pdo\MysqlAdapter; use Propel\Runtime\Propel; diff --git a/Command/WrappedCommand.php b/Command/WrappedCommand.php index a63d9c5..bd31417 100644 --- a/Command/WrappedCommand.php +++ b/Command/WrappedCommand.php @@ -8,7 +8,7 @@ * @license MIT License */ -namespace Propel\PropelBundle\Command; +namespace Propel\Bundle\PropelBundle\Command; use Symfony\Component\Console\Input\InputOption; use Symfony\Component\Console\Input\InputInterface; diff --git a/Controller/PanelController.php b/Controller/PanelController.php index dcae128..a03fd4a 100644 --- a/Controller/PanelController.php +++ b/Controller/PanelController.php @@ -8,7 +8,7 @@ * @license MIT License */ -namespace Propel\PropelBundle\Controller; +namespace Propel\Bundle\PropelBundle\Controller; use Propel\Runtime\Propel; use Symfony\Component\DependencyInjection\ContainerAware; diff --git a/DataCollector/PropelDataCollector.php b/DataCollector/PropelDataCollector.php index 7cfb3e7..524a7fd 100644 --- a/DataCollector/PropelDataCollector.php +++ b/DataCollector/PropelDataCollector.php @@ -9,9 +9,9 @@ * file that was distributed with this source code. */ -namespace Propel\PropelBundle\DataCollector; +namespace Propel\Bundle\PropelBundle\DataCollector; -use Propel\PropelBundle\Logger\PropelLogger; +use Propel\Bundle\PropelBundle\Logger\PropelLogger; use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpFoundation\Response; use Symfony\Component\HttpKernel\DataCollector\DataCollector; diff --git a/DataFixtures/AbstractDataHandler.php b/DataFixtures/AbstractDataHandler.php index 8c11f34..025cb12 100644 --- a/DataFixtures/AbstractDataHandler.php +++ b/DataFixtures/AbstractDataHandler.php @@ -8,7 +8,7 @@ * @license MIT License */ -namespace Propel\PropelBundle\DataFixtures; +namespace Propel\Bundle\PropelBundle\DataFixtures; use Propel\Runtime\Map\DatabaseMap; use Propel\Runtime\Propel; diff --git a/DataFixtures/Dumper/AbstractDataDumper.php b/DataFixtures/Dumper/AbstractDataDumper.php index 93527cc..f1cfdf3 100644 --- a/DataFixtures/Dumper/AbstractDataDumper.php +++ b/DataFixtures/Dumper/AbstractDataDumper.php @@ -8,10 +8,10 @@ * @license MIT License */ -namespace Propel\PropelBundle\DataFixtures\Dumper; +namespace Propel\Bundle\PropelBundle\DataFixtures\Dumper; use \PDO; -use Propel\PropelBundle\DataFixtures\AbstractDataHandler; +use Propel\Bundle\PropelBundle\DataFixtures\AbstractDataHandler; use Propel\Generator\Model\PropelTypes; use Propel\Runtime\Propel; diff --git a/DataFixtures/Dumper/DataDumperInterface.php b/DataFixtures/Dumper/DataDumperInterface.php index aec062c..59ce01f 100644 --- a/DataFixtures/Dumper/DataDumperInterface.php +++ b/DataFixtures/Dumper/DataDumperInterface.php @@ -8,7 +8,7 @@ * @license MIT License */ -namespace Propel\PropelBundle\DataFixtures\Dumper; +namespace Propel\Bundle\PropelBundle\DataFixtures\Dumper; /** * Interface that exposes how Propel data dumpers should work. diff --git a/DataFixtures/Dumper/YamlDataDumper.php b/DataFixtures/Dumper/YamlDataDumper.php index c927d92..32a6d7a 100644 --- a/DataFixtures/Dumper/YamlDataDumper.php +++ b/DataFixtures/Dumper/YamlDataDumper.php @@ -8,7 +8,7 @@ * @license MIT License */ -namespace Propel\PropelBundle\DataFixtures\Dumper; +namespace Propel\Bundle\PropelBundle\DataFixtures\Dumper; use Symfony\Component\Yaml\Yaml; diff --git a/DataFixtures/Loader/AbstractDataLoader.php b/DataFixtures/Loader/AbstractDataLoader.php index f8b57e7..52ddf19 100644 --- a/DataFixtures/Loader/AbstractDataLoader.php +++ b/DataFixtures/Loader/AbstractDataLoader.php @@ -8,10 +8,10 @@ * @license MIT License */ -namespace Propel\PropelBundle\DataFixtures\Loader; +namespace Propel\Bundle\PropelBundle\DataFixtures\Loader; -use Propel\PropelBundle\DataFixtures\AbstractDataHandler; -use Propel\PropelBundle\Util\PropelInflector; +use Propel\Bundle\PropelBundle\DataFixtures\AbstractDataHandler; +use Propel\Bundle\PropelBundle\Util\PropelInflector; use Propel\Generator\Model\PropelTypes; use Propel\Runtime\ActiveRecord\ActiveRecordInterface; use Propel\Runtime\Map\Exception\TableNotFoundException; diff --git a/DataFixtures/Loader/DataLoaderInterface.php b/DataFixtures/Loader/DataLoaderInterface.php index df8e8b6..5b893a4 100644 --- a/DataFixtures/Loader/DataLoaderInterface.php +++ b/DataFixtures/Loader/DataLoaderInterface.php @@ -8,7 +8,7 @@ * @license MIT License */ -namespace Propel\PropelBundle\DataFixtures\Loader; +namespace Propel\Bundle\PropelBundle\DataFixtures\Loader; /** * Interface that exposes how Propel data loaders should work. diff --git a/DataFixtures/Loader/XmlDataLoader.php b/DataFixtures/Loader/XmlDataLoader.php index efc3738..77ec0c6 100644 --- a/DataFixtures/Loader/XmlDataLoader.php +++ b/DataFixtures/Loader/XmlDataLoader.php @@ -8,7 +8,7 @@ * @license MIT License */ -namespace Propel\PropelBundle\DataFixtures\Loader; +namespace Propel\Bundle\PropelBundle\DataFixtures\Loader; /** * XML fixtures loader. diff --git a/DataFixtures/Loader/YamlDataLoader.php b/DataFixtures/Loader/YamlDataLoader.php index c06aaef..ec6042c 100644 --- a/DataFixtures/Loader/YamlDataLoader.php +++ b/DataFixtures/Loader/YamlDataLoader.php @@ -8,7 +8,7 @@ * @license MIT License */ -namespace Propel\PropelBundle\DataFixtures\Loader; +namespace Propel\Bundle\PropelBundle\DataFixtures\Loader; use Faker\Generator; use Symfony\Component\Yaml\ParseException; diff --git a/DependencyInjection/Configuration.php b/DependencyInjection/Configuration.php index fb11ef3..88ecb22 100644 --- a/DependencyInjection/Configuration.php +++ b/DependencyInjection/Configuration.php @@ -8,7 +8,7 @@ * @license MIT License */ -namespace Propel\PropelBundle\DependencyInjection; +namespace Propel\Bundle\PropelBundle\DependencyInjection; use Propel\Common\Config\PropelConfiguration; use Symfony\Component\Config\Definition\Builder\ArrayNodeDefinition; diff --git a/DependencyInjection/PropelExtension.php b/DependencyInjection/PropelExtension.php index c374553..ae50b84 100644 --- a/DependencyInjection/PropelExtension.php +++ b/DependencyInjection/PropelExtension.php @@ -8,7 +8,7 @@ * @license MIT License */ -namespace Propel\PropelBundle\DependencyInjection; +namespace Propel\Bundle\PropelBundle\DependencyInjection; use Symfony\Component\HttpKernel\DependencyInjection\Extension; use Symfony\Component\DependencyInjection\Loader\XmlFileLoader; diff --git a/DependencyInjection/Security/UserProvider/PropelFactory.php b/DependencyInjection/Security/UserProvider/PropelFactory.php index daf5af3..99a8e99 100644 --- a/DependencyInjection/Security/UserProvider/PropelFactory.php +++ b/DependencyInjection/Security/UserProvider/PropelFactory.php @@ -7,7 +7,7 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -namespace Propel\PropelBundle\DependencyInjection\Security\UserProvider; +namespace Propel\Bundle\PropelBundle\DependencyInjection\Security\UserProvider; use Symfony\Bundle\SecurityBundle\DependencyInjection\Security\UserProvider\UserProviderFactoryInterface; use Symfony\Component\Config\Definition\Builder\NodeDefinition; @@ -48,4 +48,4 @@ class PropelFactory implements UserProviderFactoryInterface ->end() ; } -} \ No newline at end of file +} diff --git a/Form/BaseAbstractType.php b/Form/BaseAbstractType.php index aab764e..7be1e7d 100644 --- a/Form/BaseAbstractType.php +++ b/Form/BaseAbstractType.php @@ -8,7 +8,7 @@ * @license MIT License */ -namespace Propel\PropelBundle\Form; +namespace Propel\Bundle\PropelBundle\Form; use Symfony\Component\Form\AbstractType; use Symfony\Component\OptionsResolver\OptionsResolver; diff --git a/Form/ChoiceList/ModelChoiceList.php b/Form/ChoiceList/ModelChoiceList.php index 35bfd60..f488253 100644 --- a/Form/ChoiceList/ModelChoiceList.php +++ b/Form/ChoiceList/ModelChoiceList.php @@ -7,7 +7,7 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -namespace Propel\PropelBundle\Form\ChoiceList; +namespace Propel\Bundle\PropelBundle\Form\ChoiceList; use Propel\Runtime\ActiveQuery\ModelCriteria; use Propel\Runtime\ActiveRecord\ActiveRecordInterface; @@ -511,4 +511,4 @@ class ModelChoiceList extends ObjectChoiceList return false; } -} \ No newline at end of file +} diff --git a/Form/DataTransformer/CollectionToArrayTransformer.php b/Form/DataTransformer/CollectionToArrayTransformer.php index 57351f9..dd066bc 100644 --- a/Form/DataTransformer/CollectionToArrayTransformer.php +++ b/Form/DataTransformer/CollectionToArrayTransformer.php @@ -9,7 +9,7 @@ * file that was distributed with this source code. */ -namespace Propel\PropelBundle\Form\DataTransformer; +namespace Propel\Bundle\PropelBundle\Form\DataTransformer; use Propel\Runtime\Collection\ObjectCollection; use Symfony\Component\Form\DataTransformerInterface; diff --git a/Form/EventListener/TranslationCollectionFormListener.php b/Form/EventListener/TranslationCollectionFormListener.php index aba4224..0572f75 100644 --- a/Form/EventListener/TranslationCollectionFormListener.php +++ b/Form/EventListener/TranslationCollectionFormListener.php @@ -8,7 +8,7 @@ * file that was distributed with this source code. */ -namespace Propel\PropelBundle\Form\EventListener; +namespace Propel\Bundle\PropelBundle\Form\EventListener; use Symfony\Component\Form\FormEvents; use Symfony\Component\Form\Exception\UnexpectedTypeException; diff --git a/Form/EventListener/TranslationFormListener.php b/Form/EventListener/TranslationFormListener.php index 785682c..9ae09bc 100644 --- a/Form/EventListener/TranslationFormListener.php +++ b/Form/EventListener/TranslationFormListener.php @@ -8,7 +8,7 @@ * file that was distributed with this source code. */ -namespace Propel\PropelBundle\Form\EventListener; +namespace Propel\Bundle\PropelBundle\Form\EventListener; use Symfony\Component\EventDispatcher\EventSubscriberInterface; use Symfony\Component\Form\FormEvent; diff --git a/Form/PropelExtension.php b/Form/PropelExtension.php index 5aac58f..9acadea 100644 --- a/Form/PropelExtension.php +++ b/Form/PropelExtension.php @@ -9,7 +9,7 @@ * file that was distributed with this source code. */ -namespace Propel\PropelBundle\Form; +namespace Propel\Bundle\PropelBundle\Form; use Symfony\Component\Form\AbstractExtension; use Symfony\Component\PropertyAccess\PropertyAccess; diff --git a/Form/Type/ModelType.php b/Form/Type/ModelType.php index 9125838..132e694 100644 --- a/Form/Type/ModelType.php +++ b/Form/Type/ModelType.php @@ -9,10 +9,10 @@ * file that was distributed with this source code. */ -namespace Propel\PropelBundle\Form\Type; +namespace Propel\Bundle\PropelBundle\Form\Type; -use Propel\PropelBundle\Form\ChoiceList\ModelChoiceList; -use Propel\PropelBundle\Form\DataTransformer\CollectionToArrayTransformer; +use Propel\Bundle\PropelBundle\Form\ChoiceList\ModelChoiceList; +use Propel\Bundle\PropelBundle\Form\DataTransformer\CollectionToArrayTransformer; use Symfony\Component\Form\AbstractType; use Symfony\Component\Form\FormBuilderInterface; use Symfony\Component\OptionsResolver\Options; diff --git a/Form/Type/TranslationCollectionType.php b/Form/Type/TranslationCollectionType.php index ac35f73..f48d752 100644 --- a/Form/Type/TranslationCollectionType.php +++ b/Form/Type/TranslationCollectionType.php @@ -9,13 +9,13 @@ * file that was distributed with this source code. */ -namespace Propel\PropelBundle\Form\Type; +namespace Propel\Bundle\PropelBundle\Form\Type; use Symfony\Component\Form\AbstractType; use Symfony\Component\OptionsResolver\Exception\MissingOptionsException; use Symfony\Component\Form\FormBuilderInterface; use Symfony\Component\OptionsResolver\OptionsResolver; -use Propel\PropelBundle\Form\EventListener\TranslationCollectionFormListener; +use Propel\Bundle\PropelBundle\Form\EventListener\TranslationCollectionFormListener; use Symfony\Component\OptionsResolver\OptionsResolverInterface; /** diff --git a/Form/Type/TranslationType.php b/Form/Type/TranslationType.php index 1adc17d..81d87a5 100644 --- a/Form/Type/TranslationType.php +++ b/Form/Type/TranslationType.php @@ -9,12 +9,12 @@ * file that was distributed with this source code. */ -namespace Propel\PropelBundle\Form\Type; +namespace Propel\Bundle\PropelBundle\Form\Type; use Symfony\Component\Form\AbstractType; use Symfony\Component\Form\FormBuilderInterface; use Symfony\Component\OptionsResolver\OptionsResolver; -use Propel\PropelBundle\Form\EventListener\TranslationFormListener; +use Propel\Bundle\PropelBundle\Form\EventListener\TranslationFormListener; use Symfony\Component\OptionsResolver\OptionsResolverInterface; /** diff --git a/Form/TypeGuesser.php b/Form/TypeGuesser.php index 757b6fa..2ce1a4d 100644 --- a/Form/TypeGuesser.php +++ b/Form/TypeGuesser.php @@ -9,7 +9,7 @@ * file that was distributed with this source code. */ -namespace Propel\PropelBundle\Form; +namespace Propel\Bundle\PropelBundle\Form; use Propel\Runtime\Map\RelationMap; use Propel\Generator\Model\PropelTypes; diff --git a/Logger/PropelLogger.php b/Logger/PropelLogger.php index 698efc3..ca6bd29 100644 --- a/Logger/PropelLogger.php +++ b/Logger/PropelLogger.php @@ -8,7 +8,7 @@ * @license MIT License */ -namespace Propel\PropelBundle\Logger; +namespace Propel\Bundle\PropelBundle\Logger; use Psr\Log\LoggerInterface; use Psr\Log\LoggerTrait; diff --git a/Model/Acl/AclClass.php b/Model/Acl/AclClass.php index 85b184f..e3051b0 100644 --- a/Model/Acl/AclClass.php +++ b/Model/Acl/AclClass.php @@ -8,9 +8,9 @@ * @license MIT License */ -namespace Propel\PropelBundle\Model\Acl; +namespace Propel\Bundle\PropelBundle\Model\Acl; -use Propel\PropelBundle\Model\Acl\Base\AclClass as BaseAclClass; +use Propel\Bundle\PropelBundle\Model\Acl\Base\AclClass as BaseAclClass; use Propel\Runtime\Connection\ConnectionInterface; use Symfony\Component\Security\Acl\Model\ObjectIdentityInterface; @@ -25,7 +25,7 @@ class AclClass extends BaseAclClass * @param \Symfony\Component\Security\Acl\Model\ObjectIdentityInterface $objectIdentity * @param ConnectionInterface $con * - * @return \Propel\PropelBundle\Model\Acl\AclClass + * @return \Propel\Bundle\PropelBundle\Model\Acl\AclClass */ public static function fromAclObjectIdentity(ObjectIdentityInterface $objectIdentity, ConnectionInterface $con = null) { diff --git a/Model/Acl/AclClassQuery.php b/Model/Acl/AclClassQuery.php index 741bdc4..b44885f 100644 --- a/Model/Acl/AclClassQuery.php +++ b/Model/Acl/AclClassQuery.php @@ -8,9 +8,9 @@ * @license MIT License */ -namespace Propel\PropelBundle\Model\Acl; +namespace Propel\Bundle\PropelBundle\Model\Acl; -use Propel\PropelBundle\Model\Acl\Base\AclClassQuery as BaseAclClassQuery; +use Propel\Bundle\PropelBundle\Model\Acl\Base\AclClassQuery as BaseAclClassQuery; class AclClassQuery extends BaseAclClassQuery { diff --git a/Model/Acl/Entry.php b/Model/Acl/Entry.php index ae44a1d..97a1ac7 100644 --- a/Model/Acl/Entry.php +++ b/Model/Acl/Entry.php @@ -8,12 +8,12 @@ * @license MIT License */ -namespace Propel\PropelBundle\Model\Acl; +namespace Propel\Bundle\PropelBundle\Model\Acl; -use Propel\PropelBundle\Model\Acl\Base\Entry as BaseEntry; +use Propel\Bundle\PropelBundle\Model\Acl\Base\Entry as BaseEntry; -use Propel\PropelBundle\Security\Acl\Domain\Entry as AclEntry; -use Propel\PropelBundle\Security\Acl\Domain\FieldEntry as AclFieldEntry; +use Propel\Bundle\PropelBundle\Security\Acl\Domain\Entry as AclEntry; +use Propel\Bundle\PropelBundle\Security\Acl\Domain\FieldEntry as AclFieldEntry; use Symfony\Component\Security\Acl\Model\AclInterface; use Symfony\Component\Security\Acl\Model\EntryInterface; @@ -29,7 +29,7 @@ class Entry extends BaseEntry * * @param \Symfony\Component\Security\Acl\Model\EntryInterface $aclEntry * - * @return \Propel\PropelBundle\Model\Acl\Entry + * @return \Propel\Bundle\PropelBundle\Model\Acl\Entry */ public static function fromAclEntry(EntryInterface $aclEntry) { @@ -64,7 +64,7 @@ class Entry extends BaseEntry /** * Transform a given model entry into an ACL related Entry (ACE). * - * @param \Propel\PropelBundle\Model\Acl\Entry $modelEntry + * @param \Propel\Bundle\PropelBundle\Model\Acl\Entry $modelEntry * @param \Symfony\Component\Security\Acl\Model\AclInterface $acl * * @return \Symfony\Component\Security\Acl\Model\EntryInterface diff --git a/Model/Acl/EntryQuery.php b/Model/Acl/EntryQuery.php index ef8a5ec..0a354f8 100644 --- a/Model/Acl/EntryQuery.php +++ b/Model/Acl/EntryQuery.php @@ -8,11 +8,11 @@ * @license MIT License */ -namespace Propel\PropelBundle\Model\Acl; +namespace Propel\Bundle\PropelBundle\Model\Acl; -use Propel\PropelBundle\Model\Acl\Base\EntryQuery as BaseEntryQuery; -use Propel\PropelBundle\Model\Acl\Map\EntryTableMap; -use Propel\PropelBundle\Model\Acl\Map\ObjectIdentityTableMap; +use Propel\Bundle\PropelBundle\Model\Acl\Base\EntryQuery as BaseEntryQuery; +use Propel\Bundle\PropelBundle\Model\Acl\Map\EntryTableMap; +use Propel\Bundle\PropelBundle\Model\Acl\Map\ObjectIdentityTableMap; use Propel\Runtime\ActiveQuery\Criteria; use Propel\Runtime\Connection\ConnectionInterface; diff --git a/Model/Acl/ObjectIdentity.php b/Model/Acl/ObjectIdentity.php index 9e2f45e..c203252 100644 --- a/Model/Acl/ObjectIdentity.php +++ b/Model/Acl/ObjectIdentity.php @@ -8,10 +8,10 @@ * @license MIT License */ -namespace Propel\PropelBundle\Model\Acl; +namespace Propel\Bundle\PropelBundle\Model\Acl; -use Propel\PropelBundle\Model\Acl\Base\ObjectIdentity as BaseObjectIdentity; -use Propel\PropelBundle\Model\Acl\Map\ObjectIdentityTableMap; +use Propel\Bundle\PropelBundle\Model\Acl\Base\ObjectIdentity as BaseObjectIdentity; +use Propel\Bundle\PropelBundle\Model\Acl\Map\ObjectIdentityTableMap; use Propel\Runtime\ActiveQuery\Criteria; use Propel\Runtime\Connection\ConnectionInterface; @@ -67,7 +67,7 @@ class ObjectIdentity extends BaseObjectIdentity * * @param ConnectionInterface $con * - * @return \Propel\PropelBundle\Model\Acl\ObjectIdentity $this + * @return \Propel\Bundle\PropelBundle\Model\Acl\ObjectIdentity $this */ protected function updateAncestorsTree(ConnectionInterface $con = null) { diff --git a/Model/Acl/ObjectIdentityAncestor.php b/Model/Acl/ObjectIdentityAncestor.php index 5dff389..a76dac0 100644 --- a/Model/Acl/ObjectIdentityAncestor.php +++ b/Model/Acl/ObjectIdentityAncestor.php @@ -8,9 +8,9 @@ * @license MIT License */ -namespace Propel\PropelBundle\Model\Acl; +namespace Propel\Bundle\PropelBundle\Model\Acl; -use Propel\PropelBundle\Model\Acl\Base\ObjectIdentityAncestor as BaseObjectIdentityAncestor; +use Propel\Bundle\PropelBundle\Model\Acl\Base\ObjectIdentityAncestor as BaseObjectIdentityAncestor; class ObjectIdentityAncestor extends BaseObjectIdentityAncestor { diff --git a/Model/Acl/ObjectIdentityAncestorQuery.php b/Model/Acl/ObjectIdentityAncestorQuery.php index 19be7a1..a3f9323 100644 --- a/Model/Acl/ObjectIdentityAncestorQuery.php +++ b/Model/Acl/ObjectIdentityAncestorQuery.php @@ -8,9 +8,9 @@ * @license MIT License */ -namespace Propel\PropelBundle\Model\Acl; +namespace Propel\Bundle\PropelBundle\Model\Acl; -use Propel\PropelBundle\Model\Acl\Base\ObjectIdentityAncestorQuery as BaseObjectIdentityAncestorQuery; +use Propel\Bundle\PropelBundle\Model\Acl\Base\ObjectIdentityAncestorQuery as BaseObjectIdentityAncestorQuery; class ObjectIdentityAncestorQuery extends BaseObjectIdentityAncestorQuery { diff --git a/Model/Acl/ObjectIdentityQuery.php b/Model/Acl/ObjectIdentityQuery.php index 1e4bc5e..d322260 100644 --- a/Model/Acl/ObjectIdentityQuery.php +++ b/Model/Acl/ObjectIdentityQuery.php @@ -8,9 +8,9 @@ * @license MIT License */ -namespace Propel\PropelBundle\Model\Acl; +namespace Propel\Bundle\PropelBundle\Model\Acl; -use Propel\PropelBundle\Model\Acl\Base\ObjectIdentityQuery as BaseObjectIdentityQuery; +use Propel\Bundle\PropelBundle\Model\Acl\Base\ObjectIdentityQuery as BaseObjectIdentityQuery; use Propel\Runtime\ActiveQuery\Criteria; use Propel\Runtime\Connection\ConnectionInterface; @@ -25,7 +25,7 @@ class ObjectIdentityQuery extends BaseObjectIdentityQuery * @param \Symfony\Component\Security\Acl\Model\ObjectIdentityInterface $objectIdentity * @param ConnectionInterface $con * - * @return \Propel\PropelBundle\Model\Acl\ObjectIdentityQuery $this + * @return \Propel\Bundle\PropelBundle\Model\Acl\ObjectIdentityQuery $this */ public function filterByAclObjectIdentity(ObjectIdentityInterface $objectIdentity, ConnectionInterface $con = null) { @@ -48,7 +48,7 @@ class ObjectIdentityQuery extends BaseObjectIdentityQuery * @param \Symfony\Component\Security\Acl\Model\ObjectIdentityInterface $objectIdentity * @param ConnectionInterface $con * - * @return \Propel\PropelBundle\Model\Acl\ObjectIdentity + * @return \Propel\Bundle\PropelBundle\Model\Acl\ObjectIdentity */ public function findOneByAclObjectIdentity(ObjectIdentityInterface $objectIdentity, ConnectionInterface $con = null) { @@ -61,8 +61,8 @@ class ObjectIdentityQuery extends BaseObjectIdentityQuery /** * Return all children of the given object identity. * - * @param \Propel\PropelBundle\Model\Acl\ObjectIdentity $objectIdentity - * @param ConnectionInterface $con + * @param \Propel\Bundle\PropelBundle\Model\Acl\ObjectIdentity $objectIdentity + * @param ConnectionInterface $con * * @return \PropelObjectCollection */ @@ -77,8 +77,8 @@ class ObjectIdentityQuery extends BaseObjectIdentityQuery /** * Return all children and grand-children of the given object identity. * - * @param \Propel\PropelBundle\Model\Acl\ObjectIdentity $objectIdentity - * @param ConnectionInterface $con + * @param \Propel\Bundle\PropelBundle\Model\Acl\ObjectIdentity $objectIdentity + * @param ConnectionInterface $con * * @return \PropelObjectCollection */ diff --git a/Model/Acl/SecurityIdentity.php b/Model/Acl/SecurityIdentity.php index 7f5fa00..aa33ea6 100644 --- a/Model/Acl/SecurityIdentity.php +++ b/Model/Acl/SecurityIdentity.php @@ -8,9 +8,9 @@ * @license MIT License */ -namespace Propel\PropelBundle\Model\Acl; +namespace Propel\Bundle\PropelBundle\Model\Acl; -use Propel\PropelBundle\Model\Acl\Base\SecurityIdentity as BaseSecurityIdentity; +use Propel\Bundle\PropelBundle\Model\Acl\Base\SecurityIdentity as BaseSecurityIdentity; use Propel\Runtime\Connection\ConnectionInterface; @@ -23,7 +23,7 @@ class SecurityIdentity extends BaseSecurityIdentity /** * Transform a given mode security identity into an ACL related SecurityIdentity. * - * @param \Propel\PropelBundle\Model\Acl\SecurityIdentity $securityIdentity + * @param \Propel\Bundle\PropelBundle\Model\Acl\SecurityIdentity $securityIdentity * * @return \Symfony\Component\Security\Acl\Model\SecurityIdentityInterface */ @@ -58,7 +58,7 @@ class SecurityIdentity extends BaseSecurityIdentity * @param \Symfony\Component\Security\Acl\Model\SecurityIdentityInterface $aclIdentity * @param ConnectionInterface $con * - * @return \Propel\PropelBundle\Model\Acl\SecurityIdentity + * @return \Propel\Bundle\PropelBundle\Model\Acl\SecurityIdentity */ public static function fromAclIdentity(SecurityIdentityInterface $aclIdentity, ConnectionInterface $con = null) { diff --git a/Model/Acl/SecurityIdentityQuery.php b/Model/Acl/SecurityIdentityQuery.php index 63044ba..cfd7168 100644 --- a/Model/Acl/SecurityIdentityQuery.php +++ b/Model/Acl/SecurityIdentityQuery.php @@ -8,9 +8,9 @@ * @license MIT License */ -namespace Propel\PropelBundle\Model\Acl; +namespace Propel\Bundle\PropelBundle\Model\Acl; -use Propel\PropelBundle\Model\Acl\Base\SecurityIdentityQuery as BaseSecurityIdentityQuery; +use Propel\Bundle\PropelBundle\Model\Acl\Base\SecurityIdentityQuery as BaseSecurityIdentityQuery; class SecurityIdentityQuery extends BaseSecurityIdentityQuery { diff --git a/PropelBundle.php b/PropelBundle.php index 55c5978..161e909 100644 --- a/PropelBundle.php +++ b/PropelBundle.php @@ -8,9 +8,9 @@ * @license MIT License */ -namespace Propel\PropelBundle; +namespace Propel\Bundle\PropelBundle; -use Propel\PropelBundle\DependencyInjection\Security\UserProvider\PropelFactory; +use Propel\Bundle\PropelBundle\DependencyInjection\Security\UserProvider\PropelFactory; use Propel\Runtime\Propel; use Propel\Runtime\Connection\ConnectionManagerSingle; use Propel\Runtime\Connection\ConnectionManagerMasterSlave; diff --git a/Request/ParamConverter/PropelParamConverter.php b/Request/ParamConverter/PropelParamConverter.php index 1b4eb42..85d36e7 100644 --- a/Request/ParamConverter/PropelParamConverter.php +++ b/Request/ParamConverter/PropelParamConverter.php @@ -1,8 +1,8 @@ - + diff --git a/Resources/config/converters.xml b/Resources/config/converters.xml index 40af5d2..a79e295 100644 --- a/Resources/config/converters.xml +++ b/Resources/config/converters.xml @@ -5,7 +5,7 @@ xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd"> - Propel\PropelBundle\Request\ParamConverter\PropelParamConverter + Propel\Bundle\PropelBundle\Request\ParamConverter\PropelParamConverter diff --git a/Resources/config/propel.xml b/Resources/config/propel.xml index af2a1ee..478b07c 100644 --- a/Resources/config/propel.xml +++ b/Resources/config/propel.xml @@ -7,15 +7,15 @@ default - Propel\PropelBundle\Service\SchemaLocator - Propel\PropelBundle\DataCollector\PropelDataCollector - Propel\PropelBundle\Logger\PropelLogger - Propel\PropelBundle\Twig\Extension\SyntaxExtension - Propel\PropelBundle\Form\TypeGuesser - Propel\PropelBundle\Form\Type\ModelType - Propel\PropelBundle\DataFixtures\Dumper\YamlDataDumper - Propel\PropelBundle\DataFixtures\Loader\YamlDataLoader - Propel\PropelBundle\DataFixtures\Loader\XmlDataLoader + Propel\Bundle\PropelBundle\Service\SchemaLocator + Propel\Bundle\PropelBundle\DataCollector\PropelDataCollector + Propel\Bundle\PropelBundle\Logger\PropelLogger + Propel\Bundle\PropelBundle\Twig\Extension\SyntaxExtension + Propel\Bundle\PropelBundle\Form\TypeGuesser + Propel\Bundle\PropelBundle\Form\Type\ModelType + Propel\Bundle\PropelBundle\DataFixtures\Dumper\YamlDataDumper + Propel\Bundle\PropelBundle\DataFixtures\Loader\YamlDataLoader + Propel\Bundle\PropelBundle\DataFixtures\Loader\XmlDataLoader diff --git a/Resources/config/security.xml b/Resources/config/security.xml index 6ef4b98..551fbd8 100644 --- a/Resources/config/security.xml +++ b/Resources/config/security.xml @@ -5,8 +5,8 @@ xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd"> - Propel\PropelBundle\Security\Acl\AuditableAclProvider - Propel\PropelBundle\Security\User\PropelUserProvider + Propel\Bundle\PropelBundle\Security\Acl\AuditableAclProvider + Propel\Bundle\PropelBundle\Security\User\PropelUserProvider diff --git a/Resources/skeleton/FormType.php b/Resources/skeleton/FormType.php index a4cbbe3..566c43c 100644 --- a/Resources/skeleton/FormType.php +++ b/Resources/skeleton/FormType.php @@ -2,7 +2,7 @@ namespace ##NAMESPACE##; -use Propel\PropelBundle\Form\BaseAbstractType; +use Propel\Bundle\PropelBundle\Form\BaseAbstractType; use Symfony\Component\Form\FormBuilderInterface; class ##CLASS## extends BaseAbstractType diff --git a/Resources/views/Collector/propel.html.twig b/Resources/views/Collector/propel.html.twig index 966e88b..d261e14 100644 --- a/Resources/views/Collector/propel.html.twig +++ b/Resources/views/Collector/propel.html.twig @@ -136,7 +136,7 @@
{{ trace }}
diff --git a/Security/Acl/AclProvider.php b/Security/Acl/AclProvider.php index 6ac4510..75b08e9 100644 --- a/Security/Acl/AclProvider.php +++ b/Security/Acl/AclProvider.php @@ -8,16 +8,16 @@ * @license MIT License */ -namespace Propel\PropelBundle\Security\Acl; +namespace Propel\Bundle\PropelBundle\Security\Acl; use Propel\Runtime\Collection\ObjectCollection; use Propel\Runtime\Connection\ConnectionInterface; -use Propel\PropelBundle\Model\Acl\EntryQuery; -use Propel\PropelBundle\Model\Acl\ObjectIdentityQuery; -use Propel\PropelBundle\Model\Acl\SecurityIdentity; +use Propel\Bundle\PropelBundle\Model\Acl\EntryQuery; +use Propel\Bundle\PropelBundle\Model\Acl\ObjectIdentityQuery; +use Propel\Bundle\PropelBundle\Model\Acl\SecurityIdentity; -use Propel\PropelBundle\Security\Acl\Domain\Acl; +use Propel\Bundle\PropelBundle\Security\Acl\Domain\Acl; use Symfony\Component\Security\Acl\Domain\ObjectIdentity; @@ -172,7 +172,7 @@ class AclProvider implements AclProviderInterface * @param \Symfony\Component\Security\Acl\Model\AclInterface $parentAcl * @param bool $inherited * - * @return \Propel\PropelBundle\Security\Acl\Domain\Acl + * @return \Propel\Bundle\PropelBundle\Security\Acl\Domain\Acl */ protected function getAcl(ObjectCollection $collection, ObjectIdentityInterface $objectIdentity, array $loadedSecurityIdentities = array(), AclInterface $parentAcl = null, $inherited = true) { diff --git a/Security/Acl/AuditableAclProvider.php b/Security/Acl/AuditableAclProvider.php index c8531e8..9a94690 100644 --- a/Security/Acl/AuditableAclProvider.php +++ b/Security/Acl/AuditableAclProvider.php @@ -8,10 +8,10 @@ * @license MIT License */ -namespace Propel\PropelBundle\Security\Acl; +namespace Propel\Bundle\PropelBundle\Security\Acl; use Propel\Runtime\Collection\ObjectCollection; -use Propel\PropelBundle\Security\Acl\Domain\AuditableAcl; +use Propel\Bundle\PropelBundle\Security\Acl\Domain\AuditableAcl; use Symfony\Component\Security\Acl\Model\AclInterface; use Symfony\Component\Security\Acl\Model\ObjectIdentityInterface; @@ -30,7 +30,7 @@ class AuditableAclProvider extends MutableAclProvider * @param \Symfony\Component\Security\Acl\Model\AclInterface $parentAcl * @param bool $inherited * - * @return \Propel\PropelBundle\Security\Acl\Domain\AuditableAcl + * @return \Propel\Bundle\PropelBundle\Security\Acl\Domain\AuditableAcl */ protected function getAcl(ObjectCollection $collection, ObjectIdentityInterface $objectIdentity, array $loadedSecurityIdentities = array(), AclInterface $parentAcl = null, $inherited = true) { diff --git a/Security/Acl/Domain/Acl.php b/Security/Acl/Domain/Acl.php index 37d60e8..02a86aa 100644 --- a/Security/Acl/Domain/Acl.php +++ b/Security/Acl/Domain/Acl.php @@ -8,7 +8,7 @@ * @license MIT License */ -namespace Propel\PropelBundle\Security\Acl\Domain; +namespace Propel\Bundle\PropelBundle\Security\Acl\Domain; use Propel\Runtime\Collection\ObjectCollection; @@ -20,13 +20,13 @@ use Symfony\Component\Security\Acl\Model\PermissionGrantingStrategyInterface; use Symfony\Component\Security\Acl\Model\SecurityIdentityInterface; /** - * An ACL implementation that is immutable based on data from a ObjectCollection of Propel\PropelBundle\Model\Acl\Entry. + * An ACL implementation that is immutable based on data from a ObjectCollection of Propel\Bundle\PropelBundle\Model\Acl\Entry. * * @author Toni Uebernickel */ class Acl implements AclInterface { - protected $model = '\Propel\PropelBundle\Model\Acl\Entry'; + protected $model = '\Propel\Bundle\PropelBundle\Model\Acl\Entry'; protected $classAces = array(); protected $classFieldAces = array(); @@ -303,7 +303,7 @@ class Acl implements AclInterface * * @param string $field * - * @return \Propel\PropelBundle\Security\Acl\Domain\Acl $this + * @return \Propel\Bundle\PropelBundle\Security\Acl\Domain\Acl $this */ protected function updateFields($field) { diff --git a/Security/Acl/Domain/AuditableAcl.php b/Security/Acl/Domain/AuditableAcl.php index 1eef18e..95f4049 100644 --- a/Security/Acl/Domain/AuditableAcl.php +++ b/Security/Acl/Domain/AuditableAcl.php @@ -8,9 +8,9 @@ * @license MIT License */ -namespace Propel\PropelBundle\Security\Acl\Domain; +namespace Propel\Bundle\PropelBundle\Security\Acl\Domain; -use Propel\PropelBundle\Model\Acl\Entry as ModelEntry; +use Propel\Bundle\PropelBundle\Model\Acl\Entry as ModelEntry; use Symfony\Component\Security\Acl\Model\AuditableAclInterface; @@ -81,7 +81,7 @@ class AuditableAcl extends MutableAcl implements AuditableAclInterface * @param bool $auditSuccess * @param bool $auditFailure * - * @return \Propel\PropelBundle\Security\Acl\Domain\AuditableAcl $this + * @return \Propel\Bundle\PropelBundle\Security\Acl\Domain\AuditableAcl $this */ protected function updateAuditing(array &$list, $index, $auditSuccess, $auditFailure) { diff --git a/Security/Acl/Domain/Entry.php b/Security/Acl/Domain/Entry.php index b9a641d..aad1bf3 100644 --- a/Security/Acl/Domain/Entry.php +++ b/Security/Acl/Domain/Entry.php @@ -8,17 +8,17 @@ * @license MIT License */ -namespace Propel\PropelBundle\Security\Acl\Domain; +namespace Propel\Bundle\PropelBundle\Security\Acl\Domain; -use Propel\PropelBundle\Model\Acl\Entry as ModelEntry; -use Propel\PropelBundle\Model\Acl\SecurityIdentity; +use Propel\Bundle\PropelBundle\Model\Acl\Entry as ModelEntry; +use Propel\Bundle\PropelBundle\Model\Acl\SecurityIdentity; use Symfony\Component\Security\Acl\Model\AclInterface; use Symfony\Component\Security\Acl\Model\AuditableEntryInterface; use Symfony\Component\Security\Acl\Model\SecurityIdentityInterface; /** - * An ACE implementation retrieving data from a given Propel\PropelBundle\Model\Acl\Entry. + * An ACE implementation retrieving data from a given Propel\Bundle\PropelBundle\Model\Acl\Entry. * * The entry is only used to grab a "snapshot" of its data as an EntryInterface is immutable! * @@ -41,7 +41,7 @@ class Entry implements AuditableEntryInterface /** * Constructor. * - * @param \Propel\PropelBundle\Model\Acl\Entry $entry + * @param \Propel\Bundle\PropelBundle\Model\Acl\Entry $entry * @param \Symfony\Component\Security\Acl\Model\AclInterface $acl */ public function __construct(ModelEntry $entry, AclInterface $acl) diff --git a/Security/Acl/Domain/FieldEntry.php b/Security/Acl/Domain/FieldEntry.php index 89e517d..abb6f48 100644 --- a/Security/Acl/Domain/FieldEntry.php +++ b/Security/Acl/Domain/FieldEntry.php @@ -8,15 +8,15 @@ * @license MIT License */ -namespace Propel\PropelBundle\Security\Acl\Domain; +namespace Propel\Bundle\PropelBundle\Security\Acl\Domain; -use Propel\PropelBundle\Model\Acl\Entry as ModelEntry; +use Propel\Bundle\PropelBundle\Model\Acl\Entry as ModelEntry; use Symfony\Component\Security\Acl\Model\AclInterface; use Symfony\Component\Security\Acl\Model\FieldEntryInterface; /** - * An ACE implementation retrieving data from a given \Propel\PropelBundle\Model\Acl\Entry. + * An ACE implementation retrieving data from a given \Propel\Bundle\PropelBundle\Model\Acl\Entry. * * The entry is only used to grab a "snapshot" of its data as an \Symfony\Component\Security\Acl\Model\EntryInterface is immutable! * @@ -31,7 +31,7 @@ class FieldEntry extends Entry implements FieldEntryInterface /** * Constructor. * - * @param \Propel\PropelBundle\Model\Acl\Entry $entry + * @param \Propel\Bundle\PropelBundle\Model\Acl\Entry $entry * @param \Symfony\Component\Security\Acl\Model\AclInterface $acl */ public function __construct(ModelEntry $entry, AclInterface $acl) diff --git a/Security/Acl/Domain/MutableAcl.php b/Security/Acl/Domain/MutableAcl.php index f68edd2..7396fae 100644 --- a/Security/Acl/Domain/MutableAcl.php +++ b/Security/Acl/Domain/MutableAcl.php @@ -8,15 +8,15 @@ * @license MIT License */ -namespace Propel\PropelBundle\Security\Acl\Domain; +namespace Propel\Bundle\PropelBundle\Security\Acl\Domain; use Propel\Runtime\Collection\ObjectCollection; use Propel\Runtime\Connection\ConnectionInterface; -use Propel\PropelBundle\Model\Acl\Entry as ModelEntry; -use Propel\PropelBundle\Model\Acl\SecurityIdentity; -use Propel\PropelBundle\Model\Acl\ObjectIdentity; -use Propel\PropelBundle\Model\Acl\ObjectIdentityQuery; +use Propel\Bundle\PropelBundle\Model\Acl\Entry as ModelEntry; +use Propel\Bundle\PropelBundle\Model\Acl\SecurityIdentity; +use Propel\Bundle\PropelBundle\Model\Acl\ObjectIdentity; +use Propel\Bundle\PropelBundle\Model\Acl\ObjectIdentityQuery; use Symfony\Component\Security\Acl\Domain\PermissionGrantingStrategy; @@ -43,7 +43,7 @@ class MutableAcl extends Acl implements MutableAclInterface /** * A reference to the ObjectIdentity this ACL is mapped to. * - * @var \Propel\PropelBundle\Model\Acl\ObjectIdentity + * @var \Propel\Bundle\PropelBundle\Model\Acl\ObjectIdentity */ protected $modelObjectIdentity; @@ -338,11 +338,11 @@ class MutableAcl extends Acl implements MutableAclInterface /** * Insert a given entry into the list on the given index by shifting all others. * - * @param array $list - * @param int $index - * @param \Propel\PropelBundle\Model\Acl\Entry\Entry $entry + * @param array $list + * @param int $index + * @param \Propel\Bundle\PropelBundle\Model\Acl\Entry\Entry $entry * - * @return \Propel\PropelBundle\Security\Acl\Domain\MutableAcl $this + * @return \Propel\Bundle\PropelBundle\Security\Acl\Domain\MutableAcl $this */ protected function insertToList(array &$list, $index, Entry $entry) { @@ -370,7 +370,7 @@ class MutableAcl extends Acl implements MutableAclInterface * @param string $strategy * @param string $field * - * @return \Propel\PropelBundle\Security\Acl\Domain\MutableAcl $this + * @return \Propel\Bundle\PropelBundle\Security\Acl\Domain\MutableAcl $this */ protected function updateAce(array &$list, $index, $mask, $strategy = null) { @@ -397,7 +397,7 @@ class MutableAcl extends Acl implements MutableAclInterface * @param array $list * @param $index * - * @return \Propel\PropelBundle\Security\Acl\Domain\MutableAcl $this + * @return \Propel\Bundle\PropelBundle\Security\Acl\Domain\MutableAcl $this */ protected function deleteIndex(array &$list, $index) { @@ -416,7 +416,7 @@ class MutableAcl extends Acl implements MutableAclInterface * @param array $list * @param int $index * - * @return \Propel\PropelBundle\Security\Acl\Domain\MutableAcl $this + * @return \Propel\Bundle\PropelBundle\Security\Acl\Domain\MutableAcl $this */ protected function isWithinBounds(array &$list, $index) { @@ -436,7 +436,7 @@ class MutableAcl extends Acl implements MutableAclInterface * @param array $list * @param $index * - * @return \Propel\PropelBundle\Security\Acl\Domain\MutableAcl $this + * @return \Propel\Bundle\PropelBundle\Security\Acl\Domain\MutableAcl $this */ protected function validateIndex(array &$list, $index) { @@ -455,7 +455,7 @@ class MutableAcl extends Acl implements MutableAclInterface * @param array $list * @param string $field * - * @return \Propel\PropelBundle\Security\Acl\Domain\MutableAcl $this + * @return \Propel\Bundle\PropelBundle\Security\Acl\Domain\MutableAcl $this */ protected function validateField(array &$list, $field) { @@ -472,7 +472,7 @@ class MutableAcl extends Acl implements MutableAclInterface * @param array $list * @param int $index The right boundary to which the list is valid. * - * @return \Propel\PropelBundle\Security\Acl\Domain\MutableAcl $this + * @return \Propel\Bundle\PropelBundle\Security\Acl\Domain\MutableAcl $this */ protected function reorderList(array &$list, $index) { @@ -494,7 +494,7 @@ class MutableAcl extends Acl implements MutableAclInterface * @param bool $granting * @param string $field * - * @return \Propel\PropelBundle\Security\Acl\Domain\Entry|\Propel\PropelBundle\Security\Acl\Domain\FieldEntry + * @return \Propel\Bundle\PropelBundle\Security\Acl\Domain\Entry|\Propel\Bundle\PropelBundle\Security\Acl\Domain\FieldEntry */ protected function createAce($mask, $index, SecurityIdentityInterface $securityIdentity, $strategy = null, $granting = true, $field = null) { diff --git a/Security/Acl/MutableAclProvider.php b/Security/Acl/MutableAclProvider.php index 22c213d..5293d73 100644 --- a/Security/Acl/MutableAclProvider.php +++ b/Security/Acl/MutableAclProvider.php @@ -8,7 +8,7 @@ * @license MIT License */ -namespace Propel\PropelBundle\Security\Acl; +namespace Propel\Bundle\PropelBundle\Security\Acl; use Propel\Runtime\ActiveQuery\Criteria; use Propel\Runtime\Collection\ObjectCollection; @@ -16,16 +16,16 @@ use Propel\Runtime\Connection\ConnectionInterface; use Propel\Runtime\Propel; use Propel\Runtime\ServiceContainer\ServiceContainerInterface; -use Propel\PropelBundle\Model\Acl\Entry as ModelEntry; -use Propel\PropelBundle\Model\Acl\Map\EntryTableMap; -use Propel\PropelBundle\Model\Acl\EntryQuery; -use Propel\PropelBundle\Model\Acl\SecurityIdentity; -use Propel\PropelBundle\Model\Acl\ObjectIdentity; -use Propel\PropelBundle\Model\Acl\ObjectIdentityQuery; +use Propel\Bundle\PropelBundle\Model\Acl\Entry as ModelEntry; +use Propel\Bundle\PropelBundle\Model\Acl\Map\EntryTableMap; +use Propel\Bundle\PropelBundle\Model\Acl\EntryQuery; +use Propel\Bundle\PropelBundle\Model\Acl\SecurityIdentity; +use Propel\Bundle\PropelBundle\Model\Acl\ObjectIdentity; +use Propel\Bundle\PropelBundle\Model\Acl\ObjectIdentityQuery; -use Propel\PropelBundle\Security\Acl\Domain\Acl; -use Propel\PropelBundle\Security\Acl\Domain\MutableAcl; -use Propel\PropelBundle\Security\Acl\Domain\Entry; +use Propel\Bundle\PropelBundle\Security\Acl\Domain\Acl; +use Propel\Bundle\PropelBundle\Security\Acl\Domain\MutableAcl; +use Propel\Bundle\PropelBundle\Security\Acl\Domain\Entry; use Symfony\Component\Security\Acl\Exception\AclAlreadyExistsException; use Symfony\Component\Security\Acl\Exception\Exception as AclException; @@ -72,7 +72,7 @@ class MutableAclProvider extends AclProvider implements MutableAclProviderInterf * * @param \Symfony\Component\Security\Acl\Model\ObjectIdentityInterface $objectIdentity * - * @return \Propel\PropelBundle\Security\Acl\Domain\MutableAcl + * @return \Propel\Bundle\PropelBundle\Security\Acl\Domain\MutableAcl */ public function createAcl(ObjectIdentityInterface $objectIdentity) { @@ -169,7 +169,7 @@ class MutableAclProvider extends AclProvider implements MutableAclProviderInterf public function updateAcl(MutableAclInterface $acl) { if (!$acl instanceof MutableAcl) { - throw new \InvalidArgumentException('The given ACL is not tracked by this provider. Please provide \Propel\PropelBundle\Security\Acl\Domain\MutableAcl only.'); + throw new \InvalidArgumentException('The given ACL is not tracked by this provider. Please provide \Propel\Bundle\PropelBundle\Security\Acl\Domain\MutableAcl only.'); } try { @@ -229,9 +229,9 @@ class MutableAclProvider extends AclProvider implements MutableAclProviderInterf /** * Persist the given ACEs. * - * @param array $accessControlEntries - * @param \Propel\PropelBundle\Model\Acl\ObjectIdentity $objectIdentity - * @param bool $object + * @param array $accessControlEntries + * @param \Propel\Bundle\PropelBundle\Model\Acl\ObjectIdentity $objectIdentity + * @param bool $object * * @return array The IDs of the persisted ACEs. */ @@ -286,7 +286,7 @@ class MutableAclProvider extends AclProvider implements MutableAclProviderInterf * * @param \Symfony\Component\Security\Acl\Model\EntryInterface $ace * - * @return \Propel\PropelBundle\Model\Acl\Entry|null + * @return \Propel\Bundle\PropelBundle\Model\Acl\Entry|null */ protected function getPersistedAce(EntryInterface $ace, ObjectIdentity $objectIdentity, $object = false) { @@ -331,7 +331,7 @@ class MutableAclProvider extends AclProvider implements MutableAclProviderInterf * @param \Symfony\Component\Security\Acl\Model\AclInterface $parentAcl * @param bool $inherited * - * @return \Propel\PropelBundle\Security\Acl\Domain\MutableAcl + * @return \Propel\Bundle\PropelBundle\Security\Acl\Domain\MutableAcl */ protected function getAcl(ObjectCollection $collection, ObjectIdentityInterface $objectIdentity, array $loadedSecurityIdentities = array(), AclInterface $parentAcl = null, $inherited = true) { diff --git a/Security/User/PropelUserProvider.php b/Security/User/PropelUserProvider.php index 5766487..cadd822 100644 --- a/Security/User/PropelUserProvider.php +++ b/Security/User/PropelUserProvider.php @@ -9,7 +9,7 @@ * file that was distributed with this source code. */ -namespace Propel\PropelBundle\Security\User; +namespace Propel\Bundle\PropelBundle\Security\User; use Symfony\Component\Security\Core\User\UserInterface; use Symfony\Component\Security\Core\User\UserProviderInterface; diff --git a/Service/SchemaLocator.php b/Service/SchemaLocator.php index 4e01eac..10de414 100644 --- a/Service/SchemaLocator.php +++ b/Service/SchemaLocator.php @@ -8,7 +8,7 @@ * @license MIT License */ -namespace Propel\PropelBundle\Service; +namespace Propel\Bundle\PropelBundle\Service; use Symfony\Component\Config\FileLocatorInterface; use Symfony\Component\Finder\Finder; diff --git a/Tests/AclTestCase.php b/Tests/AclTestCase.php index b6f14f2..23a96cd 100644 --- a/Tests/AclTestCase.php +++ b/Tests/AclTestCase.php @@ -8,14 +8,14 @@ * @license MIT License */ -namespace Propel\PropelBundle\Tests; +namespace Propel\Bundle\PropelBundle\Tests; use Propel\Generator\Util\QuickBuilder; -use Propel\PropelBundle\Model\Acl\AclClass; -use Propel\PropelBundle\Model\Acl\Entry; -use Propel\PropelBundle\Model\Acl\ObjectIdentity as ModelObjectIdentity; -use Propel\PropelBundle\Security\Acl\MutableAclProvider; +use Propel\Bundle\PropelBundle\Model\Acl\AclClass; +use Propel\Bundle\PropelBundle\Model\Acl\Entry; +use Propel\Bundle\PropelBundle\Model\Acl\ObjectIdentity as ModelObjectIdentity; +use Propel\Bundle\PropelBundle\Security\Acl\MutableAclProvider; use Symfony\Component\Security\Core\Role\Role; use Symfony\Component\Security\Acl\Domain\ObjectIdentity; @@ -38,7 +38,7 @@ class AclTestCase extends TestCase $schema = file_get_contents(__DIR__.'/../Resources/acl_schema.xml'); - if (!class_exists('Propel\PropelBundle\Model\Acl\Map\AclClassTableMap')) { + if (!class_exists('Propel\Bundle\PropelBundle\Model\Acl\Map\AclClassTableMap')) { $classTargets = array('tablemap', 'object', 'query'); } else { $classTargets = array(); @@ -51,7 +51,7 @@ class AclTestCase extends TestCase } /** - * @return \Propel\PropelBundle\Model\Acl\ObjectIdentity + * @return \Propel\Bundle\PropelBundle\Model\Acl\ObjectIdentity */ protected function createModelObjectIdentity($identifier) { @@ -94,7 +94,7 @@ class AclTestCase extends TestCase protected function getAclObjectIdentity($identifier = 1) { - return new ObjectIdentity($identifier, 'Propel\PropelBundle\Tests\Fixtures\Model\Book'); + return new ObjectIdentity($identifier, 'Propel\Bundle\PropelBundle\Tests\Fixtures\Model\Book'); } protected function getRoleSecurityIdentity($role = 'ROLE_USER') diff --git a/Tests/DataFixtures/Dumper/YamlDataDumperTest.php b/Tests/DataFixtures/Dumper/YamlDataDumperTest.php index fd1173d..a178316 100644 --- a/Tests/DataFixtures/Dumper/YamlDataDumperTest.php +++ b/Tests/DataFixtures/Dumper/YamlDataDumperTest.php @@ -8,11 +8,11 @@ * @license MIT License */ -namespace Propel\PropelBundle\Tests\DataFixtures\Dumper; +namespace Propel\Bundle\PropelBundle\Tests\DataFixtures\Dumper; use Propel\Runtime\Propel; -use Propel\PropelBundle\Tests\DataFixtures\TestCase; -use Propel\PropelBundle\DataFixtures\Dumper\YamlDataDumper; +use Propel\Bundle\PropelBundle\Tests\DataFixtures\TestCase; +use Propel\Bundle\PropelBundle\DataFixtures\Dumper\YamlDataDumper; /** * @author William Durand @@ -22,13 +22,13 @@ class YamlDataDumperTest extends TestCase { public function testYamlDump() { - $author = new \Propel\PropelBundle\Tests\Fixtures\DataFixtures\Loader\CoolBookAuthor(); + $author = new \Propel\Bundle\PropelBundle\Tests\Fixtures\DataFixtures\Loader\CoolBookAuthor(); $author->setName('A famous one')->save($this->con); $complementary = new \stdClass(); $complementary->first_word_date = '2012-01-01'; - $book = new \Propel\PropelBundle\Tests\Fixtures\DataFixtures\Loader\CoolBook(); + $book = new \Propel\Bundle\PropelBundle\Tests\Fixtures\DataFixtures\Loader\CoolBook(); $book ->setName('An important one') ->setAuthorId(1) @@ -42,11 +42,11 @@ class YamlDataDumperTest extends TestCase $loader->dump($filename); $expected = << @@ -24,10 +24,10 @@ class XmlDataLoaderTest extends TestCase { $fixtures = << - + - + @@ -38,10 +38,10 @@ XML; $loader = new XmlDataLoader(__DIR__.'/../../Fixtures/DataFixtures/Loader', array()); $loader->load(array($filename), 'default'); - $books = \Propel\PropelBundle\Tests\Fixtures\DataFixtures\Loader\CoolBookQuery::create()->find($this->con); + $books = \Propel\Bundle\PropelBundle\Tests\Fixtures\DataFixtures\Loader\CoolBookQuery::create()->find($this->con); $this->assertCount(1, $books); $book = $books[0]; - $this->assertInstanceOf('Propel\PropelBundle\Tests\Fixtures\DataFixtures\Loader\CoolBookAuthor', $book->getCoolBookAuthor()); + $this->assertInstanceOf('Propel\Bundle\PropelBundle\Tests\Fixtures\DataFixtures\Loader\CoolBookAuthor', $book->getCoolBookAuthor()); } } diff --git a/Tests/DataFixtures/Loader/YamlDataLoaderTest.php b/Tests/DataFixtures/Loader/YamlDataLoaderTest.php index 453eac3..2da18fc 100644 --- a/Tests/DataFixtures/Loader/YamlDataLoaderTest.php +++ b/Tests/DataFixtures/Loader/YamlDataLoaderTest.php @@ -8,12 +8,12 @@ * @license MIT License */ -namespace Propel\PropelBundle\Tests\DataFixtures\Loader; +namespace Propel\Bundle\PropelBundle\Tests\DataFixtures\Loader; use Propel\Generator\Util\QuickBuilder; use Propel\Runtime\Propel; -use Propel\PropelBundle\Tests\DataFixtures\TestCase; -use Propel\PropelBundle\DataFixtures\Loader\YamlDataLoader; +use Propel\Bundle\PropelBundle\Tests\DataFixtures\TestCase; +use Propel\Bundle\PropelBundle\DataFixtures\Loader\YamlDataLoader; /** * @author William Durand @@ -24,11 +24,11 @@ class YamlDataLoaderTest extends TestCase public function testYamlLoadOneToMany() { $fixtures = <<load(array($filename), 'default'); - $books = \Propel\PropelBundle\Tests\Fixtures\DataFixtures\Loader\CoolBookQuery::create()->find($this->con); + $books = \Propel\Bundle\PropelBundle\Tests\Fixtures\DataFixtures\Loader\CoolBookQuery::create()->find($this->con); $this->assertCount(1, $books); $book = $books[0]; - $this->assertInstanceOf('Propel\PropelBundle\Tests\Fixtures\DataFixtures\Loader\CoolBookAuthor', $book->getCoolBookAuthor()); + $this->assertInstanceOf('Propel\Bundle\PropelBundle\Tests\Fixtures\DataFixtures\Loader\CoolBookAuthor', $book->getCoolBookAuthor()); } public function testYamlLoadOneToManyExternalReference() @@ -52,7 +52,7 @@ YAML; $loader = new YamlDataLoader(__DIR__.'/../../Fixtures/DataFixtures/Loader', array()); $fixtures = <<load(array($filename), 'default'); $fixtures = <<getTempFile($fixtures); $loader->load(array($filename), 'default'); - $books = \Propel\PropelBundle\Tests\Fixtures\DataFixtures\Loader\CoolBookQuery::create()->find($this->con); + $books = \Propel\Bundle\PropelBundle\Tests\Fixtures\DataFixtures\Loader\CoolBookQuery::create()->find($this->con); $this->assertCount(1, $books); $book = $books[0]; - $this->assertInstanceOf('Propel\PropelBundle\Tests\Fixtures\DataFixtures\Loader\CoolBookAuthor', $book->getCoolBookAuthor()); + $this->assertInstanceOf('Propel\Bundle\PropelBundle\Tests\Fixtures\DataFixtures\Loader\CoolBookAuthor', $book->getCoolBookAuthor()); } public function testLoadSelfReferencing() { $fixtures = <<load(array($filename), 'default'); - $books = \Propel\PropelBundle\Tests\Fixtures\DataFixtures\Loader\CoolBookQuery::create()->find($this->con); + $books = \Propel\Bundle\PropelBundle\Tests\Fixtures\DataFixtures\Loader\CoolBookQuery::create()->find($this->con); $this->assertCount(0, $books); - $authors = \Propel\PropelBundle\Tests\Fixtures\DataFixtures\Loader\CoolBookAuthorQuery::create()->find($this->con); + $authors = \Propel\Bundle\PropelBundle\Tests\Fixtures\DataFixtures\Loader\CoolBookAuthorQuery::create()->find($this->con); $this->assertCount(1, $authors); $author = $authors[0]; @@ -109,7 +109,7 @@ YAML; public function testLoaderWithPhp() { $fixtures = << @@ -120,10 +120,10 @@ YAML; $loader = new YamlDataLoader(__DIR__.'/../../Fixtures/DataFixtures/Loader', array()); $loader->load(array($filename), 'default'); - $books = \Propel\PropelBundle\Tests\Fixtures\DataFixtures\Loader\CoolBookQuery::create()->find($this->con); + $books = \Propel\Bundle\PropelBundle\Tests\Fixtures\DataFixtures\Loader\CoolBookQuery::create()->find($this->con); $this->assertCount(0, $books); - $authors = \Propel\PropelBundle\Tests\Fixtures\DataFixtures\Loader\CoolBookAuthorQuery::create()->find($this->con); + $authors = \Propel\Bundle\PropelBundle\Tests\Fixtures\DataFixtures\Loader\CoolBookAuthorQuery::create()->find($this->con); $this->assertCount(1, $authors); $author = $authors[0]; @@ -133,7 +133,7 @@ YAML; public function testLoadWithoutFaker() { $fixtures = << @@ -144,10 +144,10 @@ YAML; $loader = new YamlDataLoader(__DIR__.'/../../Fixtures/DataFixtures/Loader', array()); $loader->load(array($filename), 'default'); - $books = \Propel\PropelBundle\Tests\Fixtures\DataFixtures\Loader\CoolBookQuery::create()->find($this->con); + $books = \Propel\Bundle\PropelBundle\Tests\Fixtures\DataFixtures\Loader\CoolBookQuery::create()->find($this->con); $this->assertCount(0, $books); - $authors = \Propel\PropelBundle\Tests\Fixtures\DataFixtures\Loader\CoolBookAuthorQuery::create()->find($this->con); + $authors = \Propel\Bundle\PropelBundle\Tests\Fixtures\DataFixtures\Loader\CoolBookAuthorQuery::create()->find($this->con); $this->assertCount(1, $authors); $author = $authors[0]; @@ -161,7 +161,7 @@ YAML; } $fixtures = << @@ -173,7 +173,7 @@ YAML; $loader = new YamlDataLoader(__DIR__.'/../../Fixtures/DataFixtures/Loader', array(), \Faker\Factory::create()); $loader->load(array($filename), 'default'); - $books = \Propel\PropelBundle\Tests\Fixtures\DataFixtures\Loader\CoolBookQuery::create()->find($this->con); + $books = \Propel\Bundle\PropelBundle\Tests\Fixtures\DataFixtures\Loader\CoolBookQuery::create()->find($this->con); $this->assertCount(1, $books); $book = $books[0]; @@ -188,7 +188,7 @@ YAML; public function testYamlLoadManyToMany() { $schema = << +
@@ -214,7 +214,7 @@ YAML; XML; $fixtures = <<load(array($filename), 'default'); - $books = \Propel\PropelBundle\Tests\Fixtures\DataFixtures\Loader\YamlManyToManyBookQuery::create()->find($con); + $books = \Propel\Bundle\PropelBundle\Tests\Fixtures\DataFixtures\Loader\YamlManyToManyBookQuery::create()->find($con); $this->assertCount(2, $books); - $this->assertInstanceOf('Propel\PropelBundle\Tests\Fixtures\DataFixtures\Loader\YamlManyToManyBook', $books[0]); - $this->assertInstanceOf('Propel\PropelBundle\Tests\Fixtures\DataFixtures\Loader\YamlManyToManyBook', $books[1]); + $this->assertInstanceOf('Propel\Bundle\PropelBundle\Tests\Fixtures\DataFixtures\Loader\YamlManyToManyBook', $books[0]); + $this->assertInstanceOf('Propel\Bundle\PropelBundle\Tests\Fixtures\DataFixtures\Loader\YamlManyToManyBook', $books[1]); - $authors = \Propel\PropelBundle\Tests\Fixtures\DataFixtures\Loader\YamlManyToManyAuthorQuery::create()->find($con);; + $authors = \Propel\Bundle\PropelBundle\Tests\Fixtures\DataFixtures\Loader\YamlManyToManyAuthorQuery::create()->find($con);; $this->assertCount(2, $authors); - $this->assertInstanceOf('Propel\PropelBundle\Tests\Fixtures\DataFixtures\Loader\YamlManyToManyAuthor', $authors[0]); - $this->assertInstanceOf('Propel\PropelBundle\Tests\Fixtures\DataFixtures\Loader\YamlManyToManyAuthor', $authors[1]); + $this->assertInstanceOf('Propel\Bundle\PropelBundle\Tests\Fixtures\DataFixtures\Loader\YamlManyToManyAuthor', $authors[0]); + $this->assertInstanceOf('Propel\Bundle\PropelBundle\Tests\Fixtures\DataFixtures\Loader\YamlManyToManyAuthor', $authors[1]); - $bookAuthors = \Propel\PropelBundle\Tests\Fixtures\DataFixtures\Loader\YamlManyToManyBookAuthorQuery::create()->find($con);; + $bookAuthors = \Propel\Bundle\PropelBundle\Tests\Fixtures\DataFixtures\Loader\YamlManyToManyBookAuthorQuery::create()->find($con);; $this->assertCount(2, $bookAuthors); - $this->assertInstanceOf('Propel\PropelBundle\Tests\Fixtures\DataFixtures\Loader\YamlManyToManyBookAuthor', $bookAuthors[0]); - $this->assertInstanceOf('Propel\PropelBundle\Tests\Fixtures\DataFixtures\Loader\YamlManyToManyBookAuthor', $bookAuthors[1]); + $this->assertInstanceOf('Propel\Bundle\PropelBundle\Tests\Fixtures\DataFixtures\Loader\YamlManyToManyBookAuthor', $bookAuthors[0]); + $this->assertInstanceOf('Propel\Bundle\PropelBundle\Tests\Fixtures\DataFixtures\Loader\YamlManyToManyBookAuthor', $bookAuthors[1]); $this->assertEquals('Victor Hugo', $authors[1]->getName()); $this->assertTrue($authors[1]->getBooks()->contains($books[1])); @@ -270,7 +270,7 @@ YAML; public function testYamlLoadManyToManyMultipleFiles() { $schema = << +
@@ -296,29 +296,29 @@ YAML; XML; $fixtures1 = <<load(array($filename1, $filename2), 'default'); - $books = \Propel\PropelBundle\Tests\Fixtures\DataFixtures\Loader\YamlManyToManyMultipleFilesBookQuery::create()->find($con); + $books = \Propel\Bundle\PropelBundle\Tests\Fixtures\DataFixtures\Loader\YamlManyToManyMultipleFilesBookQuery::create()->find($con); $this->assertCount(2, $books); - $this->assertInstanceOf('Propel\PropelBundle\Tests\Fixtures\DataFixtures\Loader\YamlManyToManyMultipleFilesBook', $books[0]); - $this->assertInstanceOf('Propel\PropelBundle\Tests\Fixtures\DataFixtures\Loader\YamlManyToManyMultipleFilesBook', $books[1]); + $this->assertInstanceOf('Propel\Bundle\PropelBundle\Tests\Fixtures\DataFixtures\Loader\YamlManyToManyMultipleFilesBook', $books[0]); + $this->assertInstanceOf('Propel\Bundle\PropelBundle\Tests\Fixtures\DataFixtures\Loader\YamlManyToManyMultipleFilesBook', $books[1]); - $authors = \Propel\PropelBundle\Tests\Fixtures\DataFixtures\Loader\YamlManyToManyMultipleFilesAuthorQuery::create()->find($con); + $authors = \Propel\Bundle\PropelBundle\Tests\Fixtures\DataFixtures\Loader\YamlManyToManyMultipleFilesAuthorQuery::create()->find($con); $this->assertCount(2, $authors); - $this->assertInstanceOf('Propel\PropelBundle\Tests\Fixtures\DataFixtures\Loader\YamlManyToManyMultipleFilesAuthor', $authors[0]); - $this->assertInstanceOf('Propel\PropelBundle\Tests\Fixtures\DataFixtures\Loader\YamlManyToManyMultipleFilesAuthor', $authors[1]); + $this->assertInstanceOf('Propel\Bundle\PropelBundle\Tests\Fixtures\DataFixtures\Loader\YamlManyToManyMultipleFilesAuthor', $authors[0]); + $this->assertInstanceOf('Propel\Bundle\PropelBundle\Tests\Fixtures\DataFixtures\Loader\YamlManyToManyMultipleFilesAuthor', $authors[1]); - $bookAuthors = \Propel\PropelBundle\Tests\Fixtures\DataFixtures\Loader\YamlManyToManyMultipleFilesBookAuthorQuery::create()->find($con); + $bookAuthors = \Propel\Bundle\PropelBundle\Tests\Fixtures\DataFixtures\Loader\YamlManyToManyMultipleFilesBookAuthorQuery::create()->find($con); $this->assertCount(2, $bookAuthors); - $this->assertInstanceOf('Propel\PropelBundle\Tests\Fixtures\DataFixtures\Loader\YamlManyToManyMultipleFilesBookAuthor', $bookAuthors[0]); - $this->assertInstanceOf('Propel\PropelBundle\Tests\Fixtures\DataFixtures\Loader\YamlManyToManyMultipleFilesBookAuthor', $bookAuthors[1]); + $this->assertInstanceOf('Propel\Bundle\PropelBundle\Tests\Fixtures\DataFixtures\Loader\YamlManyToManyMultipleFilesBookAuthor', $bookAuthors[0]); + $this->assertInstanceOf('Propel\Bundle\PropelBundle\Tests\Fixtures\DataFixtures\Loader\YamlManyToManyMultipleFilesBookAuthor', $bookAuthors[1]); $this->assertEquals('Victor Hugo', $authors[1]->getName()); $this->assertTrue($authors[1]->getBooks()->contains($books[1])); @@ -358,7 +358,7 @@ YAML; public function testLoadWithInheritedRelationship() { $schema = << +
@@ -385,11 +385,11 @@ YAML; XML; $fixtures = <<load(array($filename), 'default'); - $books = \Propel\PropelBundle\Tests\Fixtures\DataFixtures\Loader\YamlInheritedRelationshipBookQuery::create()->find($con); + $books = \Propel\Bundle\PropelBundle\Tests\Fixtures\DataFixtures\Loader\YamlInheritedRelationshipBookQuery::create()->find($con); $this->assertCount(1, $books); $book = $books[0]; $author = $book->getAuthor(); - $this->assertInstanceOf('Propel\PropelBundle\Tests\Fixtures\DataFixtures\Loader\YamlInheritedRelationshipAuthor', $author); + $this->assertInstanceOf('Propel\Bundle\PropelBundle\Tests\Fixtures\DataFixtures\Loader\YamlInheritedRelationshipAuthor', $author); } public function testLoadArrayToObjectType() { $schema = << +
@@ -424,7 +424,7 @@ YAML; XML; $fixtures = <<load(array($filename), 'default'); - $book = \Propel\PropelBundle\Tests\Fixtures\DataFixtures\Loader\YamlBookWithObjectQuery::create(null)->findOne($con); + $book = \Propel\Bundle\PropelBundle\Tests\Fixtures\DataFixtures\Loader\YamlBookWithObjectQuery::create(null)->findOne($con); - $this->assertInstanceOf('\Propel\PropelBundle\Tests\Fixtures\DataFixtures\Loader\YamlBookWithObject', $book); + $this->assertInstanceOf('\Propel\Bundle\PropelBundle\Tests\Fixtures\DataFixtures\Loader\YamlBookWithObject', $book); $this->assertEquals(array('opt1' => 2012, 'opt2' => 140, 'inner' => array('subOpt' => 123)), $book->getOptions()); } public function testLoadDelegatedOnPrimaryKey() { $schema = << +
@@ -470,11 +470,11 @@ YAML; XML; $fixtures = <<load(array($filename), 'default'); - $authors = \Propel\PropelBundle\Tests\Fixtures\DataFixtures\Loader\YamlDelegateOnPrimaryKeyAuthorQuery::create()->find($con); + $authors = \Propel\Bundle\PropelBundle\Tests\Fixtures\DataFixtures\Loader\YamlDelegateOnPrimaryKeyAuthorQuery::create()->find($con); $this->assertCount(1, $authors); $author = $authors[0]; $person = $author->getYamlDelegateOnPrimaryKeyPerson(); - $this->assertInstanceOf('Propel\PropelBundle\Tests\Fixtures\DataFixtures\Loader\YamlDelegateOnPrimaryKeyPerson', $person); + $this->assertInstanceOf('Propel\Bundle\PropelBundle\Tests\Fixtures\DataFixtures\Loader\YamlDelegateOnPrimaryKeyPerson', $person); } } diff --git a/Tests/DataFixtures/TestCase.php b/Tests/DataFixtures/TestCase.php index 3a5abcf..5cf7761 100644 --- a/Tests/DataFixtures/TestCase.php +++ b/Tests/DataFixtures/TestCase.php @@ -8,11 +8,11 @@ * @license MIT License */ -namespace Propel\PropelBundle\Tests\DataFixtures; +namespace Propel\Bundle\PropelBundle\Tests\DataFixtures; use Propel\Generator\Util\QuickBuilder; use Propel\Runtime\Propel; -use Propel\PropelBundle\Tests\TestCase as BaseTestCase; +use Propel\Bundle\PropelBundle\Tests\TestCase as BaseTestCase; /** * @author Toni Uebernickel @@ -35,9 +35,9 @@ class TestCase extends BaseTestCase { parent::setUp(); - if (!class_exists('Propel\PropelBundle\Tests\Fixtures\DataFixtures\Loader\CoolBook')) { + if (!class_exists('Propel\Bundle\PropelBundle\Tests\Fixtures\DataFixtures\Loader\CoolBook')) { $schema = << +
diff --git a/Tests/Fixtures/Acl/ArrayCache.php b/Tests/Fixtures/Acl/ArrayCache.php index 0a74dd1..79d298c 100644 --- a/Tests/Fixtures/Acl/ArrayCache.php +++ b/Tests/Fixtures/Acl/ArrayCache.php @@ -8,7 +8,7 @@ * @license MIT License */ -namespace Propel\PropelBundle\Tests\Fixtures\Acl; +namespace Propel\Bundle\PropelBundle\Tests\Fixtures\Acl; use Symfony\Component\Security\Acl\Model\AclInterface; use Symfony\Component\Security\Acl\Model\AclCacheInterface; diff --git a/Tests/Fixtures/Column.php b/Tests/Fixtures/Column.php index 38d615e..ac83b7c 100644 --- a/Tests/Fixtures/Column.php +++ b/Tests/Fixtures/Column.php @@ -9,7 +9,7 @@ * file that was distributed with this source code. */ -namespace Propel\PropelBundle\Tests\Fixtures; +namespace Propel\Bundle\PropelBundle\Tests\Fixtures; use Propel\Generator\Model\PropelTypes; diff --git a/Tests/Fixtures/Item.php b/Tests/Fixtures/Item.php index b111510..4b19c1c 100644 --- a/Tests/Fixtures/Item.php +++ b/Tests/Fixtures/Item.php @@ -9,7 +9,7 @@ * file that was distributed with this source code. */ -namespace Propel\PropelBundle\Tests\Fixtures; +namespace Propel\Bundle\PropelBundle\Tests\Fixtures; use Propel\Runtime\ActiveRecord\ActiveRecordInterface; use Propel\Runtime\Connection\ConnectionInterface; diff --git a/Tests/Fixtures/ItemQuery.php b/Tests/Fixtures/ItemQuery.php index 30aeef4..15f48e8 100644 --- a/Tests/Fixtures/ItemQuery.php +++ b/Tests/Fixtures/ItemQuery.php @@ -9,7 +9,7 @@ * file that was distributed with this source code. */ -namespace Propel\PropelBundle\Tests\Fixtures; +namespace Propel\Bundle\PropelBundle\Tests\Fixtures; use Propel\Runtime\Map\ColumnMap; use Propel\Runtime\Map\RelationMap; diff --git a/Tests/Fixtures/Model/Base/Book.php b/Tests/Fixtures/Model/Base/Book.php index 2e43ed7..c499cf7 100644 --- a/Tests/Fixtures/Model/Base/Book.php +++ b/Tests/Fixtures/Model/Base/Book.php @@ -1,11 +1,11 @@ setModelAlias($modelAlias); } diff --git a/Tests/Fixtures/Model/Book.php b/Tests/Fixtures/Model/Book.php index e031cd9..a0fa5c4 100644 --- a/Tests/Fixtures/Model/Book.php +++ b/Tests/Fixtures/Model/Book.php @@ -1,8 +1,8 @@ setName('book'); $this->setPhpName('Book'); - $this->setClassName('\\Propel\\PropelBundle\\Tests\\Fixtures\\Model\\Book'); + $this->setClassName('\\Propel\\Bundle\\PropelBundle\\Tests\\Fixtures\\Model\\Book'); $this->setPackage('src.Acme.DemoBundle.Model'); $this->setUseIdGenerator(true); // columns diff --git a/Tests/Fixtures/Model/User.php b/Tests/Fixtures/Model/User.php index a9bfe4b..091453e 100644 --- a/Tests/Fixtures/Model/User.php +++ b/Tests/Fixtures/Model/User.php @@ -1,8 +1,8 @@ @@ -27,11 +27,11 @@ class AclClassTest extends AclTestCase $type = 'Merchant'; $aclClass = AclClass::fromAclObjectIdentity(new ObjectIdentity(5, $type), $this->con); - $this->assertInstanceOf('Propel\PropelBundle\Model\Acl\AclClass', $aclClass); + $this->assertInstanceOf('Propel\Bundle\PropelBundle\Model\Acl\AclClass', $aclClass); $this->assertEquals($type, $aclClass->getType()); $dbEntry = AclClassQuery::create()->findOne($this->con); - $this->assertInstanceOf('Propel\PropelBundle\Model\Acl\AclClass', $dbEntry); + $this->assertInstanceOf('Propel\Bundle\PropelBundle\Model\Acl\AclClass', $dbEntry); $this->assertEquals($type, $dbEntry->getType()); $this->assertEquals($dbEntry->getId(), $aclClass->getId()); diff --git a/Tests/Model/EntryQueryTest.php b/Tests/Model/EntryQueryTest.php index d875ee6..3fca878 100644 --- a/Tests/Model/EntryQueryTest.php +++ b/Tests/Model/EntryQueryTest.php @@ -8,15 +8,15 @@ * @license MIT License */ -namespace Propel\PropelBundle\Tests\Model\Acl; +namespace Propel\Bundle\PropelBundle\Tests\Model\Acl; -use Propel\PropelBundle\Model\Acl\Entry; -use Propel\PropelBundle\Model\Acl\EntryQuery; -use Propel\PropelBundle\Model\Acl\SecurityIdentity; +use Propel\Bundle\PropelBundle\Model\Acl\Entry; +use Propel\Bundle\PropelBundle\Model\Acl\EntryQuery; +use Propel\Bundle\PropelBundle\Model\Acl\SecurityIdentity; use Symfony\Component\Security\Acl\Domain\ObjectIdentity; -use Propel\PropelBundle\Tests\AclTestCase; +use Propel\Bundle\PropelBundle\Tests\AclTestCase; /** * @author Toni Uebernickel diff --git a/Tests/Model/EntryTest.php b/Tests/Model/EntryTest.php index a2271f8..ae28f6f 100644 --- a/Tests/Model/EntryTest.php +++ b/Tests/Model/EntryTest.php @@ -8,14 +8,14 @@ * @license MIT License */ -namespace Propel\PropelBundle\Tests\Model\Acl; +namespace Propel\Bundle\PropelBundle\Tests\Model\Acl; -use Propel\PropelBundle\Model\Acl\Entry as ModelEntry; -use Propel\PropelBundle\Model\Acl\SecurityIdentity; +use Propel\Bundle\PropelBundle\Model\Acl\Entry as ModelEntry; +use Propel\Bundle\PropelBundle\Model\Acl\SecurityIdentity; -use Propel\PropelBundle\Security\Acl\Domain\Entry as AclEntry; +use Propel\Bundle\PropelBundle\Security\Acl\Domain\Entry as AclEntry; -use Propel\PropelBundle\Tests\AclTestCase; +use Propel\Bundle\PropelBundle\Tests\AclTestCase; /** * @author Toni Uebernickel @@ -24,11 +24,11 @@ class EntryTest extends AclTestCase { public function testToAclEntry() { - $acl = $this->getMock('Propel\PropelBundle\Security\Acl\Domain\AuditableAcl', array(), array(), '', false, false); + $acl = $this->getMock('Propel\Bundle\PropelBundle\Security\Acl\Domain\AuditableAcl', array(), array(), '', false, false); $entry = $this->createModelEntry(); $aclEntry = ModelEntry::toAclEntry($entry, $acl); - $this->assertInstanceOf('Propel\PropelBundle\Security\Acl\Domain\Entry', $aclEntry); + $this->assertInstanceOf('Propel\Bundle\PropelBundle\Security\Acl\Domain\Entry', $aclEntry); $this->assertSame($acl, $aclEntry->getAcl()); $this->assertEquals(42, $aclEntry->getId()); $this->assertTrue($aclEntry->isAuditFailure()); @@ -45,12 +45,12 @@ class EntryTest extends AclTestCase */ public function testToAclEntryFieldEntry() { - $acl = $this->getMock('Propel\PropelBundle\Security\Acl\Domain\AuditableAcl', array(), array(), '', false, false); + $acl = $this->getMock('Propel\Bundle\PropelBundle\Security\Acl\Domain\AuditableAcl', array(), array(), '', false, false); $entry = $this->createModelEntry(); $entry->setFieldName('name'); $aclEntry = ModelEntry::toAclEntry($entry, $acl); - $this->assertInstanceOf('Propel\PropelBundle\Security\Acl\Domain\FieldEntry', $aclEntry); + $this->assertInstanceOf('Propel\Bundle\PropelBundle\Security\Acl\Domain\FieldEntry', $aclEntry); } /** @@ -60,7 +60,7 @@ class EntryTest extends AclTestCase { $modelEntry = ModelEntry::fromAclEntry($aclEntry); - $this->assertInstanceOf('Propel\PropelBundle\Model\Acl\Entry', $modelEntry); + $this->assertInstanceOf('Propel\Bundle\PropelBundle\Model\Acl\Entry', $modelEntry); $this->assertEquals(42, $modelEntry->getId()); $this->assertTrue($modelEntry->getAuditFailure()); $this->assertFalse($modelEntry->getAuditSuccess()); diff --git a/Tests/Model/ObjectIdentityQueryTest.php b/Tests/Model/ObjectIdentityQueryTest.php index d6a7a73..f145e56 100644 --- a/Tests/Model/ObjectIdentityQueryTest.php +++ b/Tests/Model/ObjectIdentityQueryTest.php @@ -8,14 +8,14 @@ * @license MIT License */ -namespace Propel\PropelBundle\Tests\Model\Acl; +namespace Propel\Bundle\PropelBundle\Tests\Model\Acl; -use Propel\PropelBundle\Model\Acl\AclClass; -use Propel\PropelBundle\Model\Acl\ObjectIdentityQuery; +use Propel\Bundle\PropelBundle\Model\Acl\AclClass; +use Propel\Bundle\PropelBundle\Model\Acl\ObjectIdentityQuery; use Symfony\Component\Security\Acl\Domain\ObjectIdentity; -use Propel\PropelBundle\Tests\AclTestCase; +use Propel\Bundle\PropelBundle\Tests\AclTestCase; /** * @author Toni Uebernickel @@ -24,10 +24,10 @@ class ObjectIdentityQueryTest extends AclTestCase { public function testFilterByAclObjectIdentity() { - $aclObj = new ObjectIdentity(1, 'Propel\PropelBundle\Tests\Fixtures\Model\Book'); + $aclObj = new ObjectIdentity(1, 'Propel\Bundle\PropelBundle\Tests\Fixtures\Model\Book'); $aclClass = AclClass::fromAclObjectIdentity($aclObj, $this->con); - $this->assertInstanceOf('Propel\PropelBundle\Model\Acl\AclClass', $aclClass); + $this->assertInstanceOf('Propel\Bundle\PropelBundle\Model\Acl\AclClass', $aclClass); // None given. $result = ObjectIdentityQuery::create()->filterByAclObjectIdentity($aclObj, $this->con)->find($this->con); @@ -42,7 +42,7 @@ class ObjectIdentityQueryTest extends AclTestCase $this->assertEquals(1, $result->getFirst()->getIdentifier()); // Change the entity. - $aclObj = new ObjectIdentity(2, 'Propel\PropelBundle\Tests\Fixtures\Model\Book'); + $aclObj = new ObjectIdentity(2, 'Propel\Bundle\PropelBundle\Tests\Fixtures\Model\Book'); $result = ObjectIdentityQuery::create()->filterByAclObjectIdentity($aclObj, $this->con)->find($this->con); $this->assertCount(0, $result); } @@ -52,7 +52,7 @@ class ObjectIdentityQueryTest extends AclTestCase */ public function testFindOneByAclObjectIdentity() { - $aclObj = new ObjectIdentity(1, 'Propel\PropelBundle\Tests\Fixtures\Model\Book'); + $aclObj = new ObjectIdentity(1, 'Propel\Bundle\PropelBundle\Tests\Fixtures\Model\Book'); $result = ObjectIdentityQuery::create()->findOneByAclObjectIdentity($aclObj, $this->con); $this->assertEmpty($result); @@ -60,7 +60,7 @@ class ObjectIdentityQueryTest extends AclTestCase $objIdentity = $this->createModelObjectIdentity(1); $result = ObjectIdentityQuery::create()->findOneByAclObjectIdentity($aclObj, $this->con); - $this->assertInstanceOf('Propel\PropelBundle\Model\Acl\ObjectIdentity', $result); + $this->assertInstanceOf('Propel\Bundle\PropelBundle\Model\Acl\ObjectIdentity', $result); $this->assertSame($objIdentity, $result); } @@ -79,7 +79,7 @@ class ObjectIdentityQueryTest extends AclTestCase $result = ObjectIdentityQuery::create()->findChildren($objIdentity, $this->con); $this->assertCount(1, $result); - $this->assertInstanceOf('Propel\PropelBundle\Model\Acl\ObjectIdentity', $result->getFirst()); + $this->assertInstanceOf('Propel\Bundle\PropelBundle\Model\Acl\ObjectIdentity', $result->getFirst()); $this->assertSame($childObjIdentity, $result->getFirst()); $this->assertSame($objIdentity, $result->getFirst()->getObjectIdentityRelatedByParentObjectIdentityId()); } diff --git a/Tests/Model/ObjectIdentityTest.php b/Tests/Model/ObjectIdentityTest.php index 3f8379c..04f83db 100644 --- a/Tests/Model/ObjectIdentityTest.php +++ b/Tests/Model/ObjectIdentityTest.php @@ -8,15 +8,15 @@ * @license MIT License */ -namespace Propel\PropelBundle\Tests\Model\Acl; +namespace Propel\Bundle\PropelBundle\Tests\Model\Acl; use Propel\Runtime\ActiveQuery\Criteria; -use Propel\PropelBundle\Model\Acl\ObjectIdentity; -use Propel\PropelBundle\Model\Acl\ObjectIdentityQuery; -use Propel\PropelBundle\Model\Acl\ObjectIdentityAncestorQuery; +use Propel\Bundle\PropelBundle\Model\Acl\ObjectIdentity; +use Propel\Bundle\PropelBundle\Model\Acl\ObjectIdentityQuery; +use Propel\Bundle\PropelBundle\Model\Acl\ObjectIdentityAncestorQuery; -use Propel\PropelBundle\Tests\AclTestCase; +use Propel\Bundle\PropelBundle\Tests\AclTestCase; /** * @author Toni Uebernickel diff --git a/Tests/Model/SecurityIdentityTest.php b/Tests/Model/SecurityIdentityTest.php index 3f27ba0..4081707 100644 --- a/Tests/Model/SecurityIdentityTest.php +++ b/Tests/Model/SecurityIdentityTest.php @@ -8,16 +8,16 @@ * @license MIT License */ -namespace Propel\PropelBundle\Tests\Model\Acl; +namespace Propel\Bundle\PropelBundle\Tests\Model\Acl; -use Propel\PropelBundle\Model\Acl\SecurityIdentity; -use Propel\PropelBundle\Model\Acl\SecurityIdentityQuery; +use Propel\Bundle\PropelBundle\Model\Acl\SecurityIdentity; +use Propel\Bundle\PropelBundle\Model\Acl\SecurityIdentityQuery; use Symfony\Component\Security\Core\Role\Role; use Symfony\Component\Security\Acl\Domain\RoleSecurityIdentity; use Symfony\Component\Security\Acl\Domain\UserSecurityIdentity; -use Propel\PropelBundle\Tests\AclTestCase; +use Propel\Bundle\PropelBundle\Tests\AclTestCase; /** * @author Toni Uebernickel @@ -47,7 +47,7 @@ class SecurityIdentityTest extends AclTestCase public function testToAclIdentityValidUser() { $identity = new SecurityIdentity(); - $identity->setIdentifier('Propel\PropelBundle\Tests\Fixtures\UserProxy-propel'); + $identity->setIdentifier('Propel\Bundle\PropelBundle\Tests\Fixtures\UserProxy-propel'); $identity->setUsername(true); $secIdentity = SecurityIdentity::toAclIdentity($identity); @@ -57,7 +57,7 @@ class SecurityIdentityTest extends AclTestCase public function testToAclIdentityMultipleDashes() { $identity = new SecurityIdentity(); - $identity->setIdentifier('Propel\PropelBundle\Tests\Fixtures\UserProxy-some-username@domain.com'); + $identity->setIdentifier('Propel\Bundle\PropelBundle\Tests\Fixtures\UserProxy-some-username@domain.com'); $identity->setUsername(true); $secIdentity = SecurityIdentity::toAclIdentity($identity); @@ -92,17 +92,17 @@ class SecurityIdentityTest extends AclTestCase public function testFromAclIdentityWithUser() { - $secIdentity = new UserSecurityIdentity('propel', 'Propel\PropelBundle\Tests\Fixtures\UserProxy'); + $secIdentity = new UserSecurityIdentity('propel', 'Propel\Bundle\PropelBundle\Tests\Fixtures\UserProxy'); $identity = SecurityIdentity::fromAclIdentity($secIdentity, $this->con); - $this->assertInstanceOf('Propel\PropelBundle\Model\Acl\SecurityIdentity', $identity); + $this->assertInstanceOf('Propel\Bundle\PropelBundle\Model\Acl\SecurityIdentity', $identity); $this->assertEquals(true, $identity->getUsername()); - $this->assertEquals('Propel\PropelBundle\Tests\Fixtures\UserProxy-propel', $identity->getIdentifier()); + $this->assertEquals('Propel\Bundle\PropelBundle\Tests\Fixtures\UserProxy-propel', $identity->getIdentifier()); $this->assertGreaterThan(0, $identity->getId()); $dbEntry = SecurityIdentityQuery::create()->findPk($identity->getId()); - $this->assertInstanceOf('Propel\PropelBundle\Model\Acl\SecurityIdentity', $dbEntry); + $this->assertInstanceOf('Propel\Bundle\PropelBundle\Model\Acl\SecurityIdentity', $dbEntry); } public function testFromAclIdentityWithRole() @@ -111,12 +111,12 @@ class SecurityIdentityTest extends AclTestCase $identity = SecurityIdentity::fromAclIdentity($secIdentity, $this->con); - $this->assertInstanceOf('Propel\PropelBundle\Model\Acl\SecurityIdentity', $identity); + $this->assertInstanceOf('Propel\Bundle\PropelBundle\Model\Acl\SecurityIdentity', $identity); $this->assertEquals(false, $identity->getUsername()); $this->assertEquals('ROLE_USER', $identity->getIdentifier()); $this->assertGreaterThan(0, $identity->getId()); $dbEntry = SecurityIdentityQuery::create()->findPk($identity->getId()); - $this->assertInstanceOf('Propel\PropelBundle\Model\Acl\SecurityIdentity', $dbEntry); + $this->assertInstanceOf('Propel\Bundle\PropelBundle\Model\Acl\SecurityIdentity', $dbEntry); } } diff --git a/Tests/Request/ParamConverter/PropelParamConverterTest.php b/Tests/Request/ParamConverter/PropelParamConverterTest.php index f610637..ab10e65 100644 --- a/Tests/Request/ParamConverter/PropelParamConverterTest.php +++ b/Tests/Request/ParamConverter/PropelParamConverterTest.php @@ -1,13 +1,13 @@ 'Propel\PropelBundle\Tests\Fixtures\Model\Book')); + $configuration = new ParamConverter(array('class' => 'Propel\Bundle\PropelBundle\Tests\Fixtures\Model\Book')); $this->assertTrue($paramConverter->supports($configuration), 'param converter should support propel class'); $configuration = new ParamConverter(array('class' =>'fakeClass')); $this->assertFalse($paramConverter->supports($configuration), 'param converter should not support wrong class'); - $configuration = new ParamConverter(array('class' =>'Propel\PropelBundle\Tests\TestCase')); + $configuration = new ParamConverter(array('class' =>'Propel\Bundle\PropelBundle\Tests\TestCase')); $this->assertFalse($paramConverter->supports($configuration), 'param converter should not support wrong class'); } @@ -55,13 +55,13 @@ class PropelParamConverterTest extends TestCase { $paramConverter = new PropelParamConverter(); $request = new Request(array(), array(), array('id' => 1, 'book' => null)); - $configuration = new ParamConverter(array('class' => 'Propel\PropelBundle\Tests\Fixtures\Model\Book', 'name' => 'book')); + $configuration = new ParamConverter(array('class' => 'Propel\Bundle\PropelBundle\Tests\Fixtures\Model\Book', 'name' => 'book')); $paramConverter->apply($request, $configuration); $this->assertInstanceOf( - 'Propel\PropelBundle\Tests\Fixtures\Model\Book', $request->attributes->get('book'), - 'param "book" should be an instance of "Propel\PropelBundle\Tests\Fixtures\Model\Book"' + 'Propel\Bundle\PropelBundle\Tests\Fixtures\Model\Book', $request->attributes->get('book'), + 'param "book" should be an instance of "Propel\Bundle\PropelBundle\Tests\Fixtures\Model\Book"' ); } @@ -72,7 +72,7 @@ class PropelParamConverterTest extends TestCase { $paramConverter = new PropelParamConverter(); $request = new Request(array(), array(), array('id' => 2, 'book' => null)); - $configuration = new ParamConverter(array('class' => 'Propel\PropelBundle\Tests\Fixtures\Model\Book', 'name' => 'book')); + $configuration = new ParamConverter(array('class' => 'Propel\Bundle\PropelBundle\Tests\Fixtures\Model\Book', 'name' => 'book')); $paramConverter->apply($request, $configuration); } @@ -80,21 +80,21 @@ class PropelParamConverterTest extends TestCase { $paramConverter = new PropelParamConverter(); $request = new Request(array(), array(), array('slug' => 'my-book', 'book' => null)); - $configuration = new ParamConverter(array('class' => 'Propel\PropelBundle\Tests\Fixtures\Model\Book', 'name' => 'book')); + $configuration = new ParamConverter(array('class' => 'Propel\Bundle\PropelBundle\Tests\Fixtures\Model\Book', 'name' => 'book')); $paramConverter->apply($request, $configuration); - $this->assertInstanceOf('Propel\PropelBundle\Tests\Fixtures\Model\Book', $request->attributes->get('book'), - 'param "book" should be an instance of "Propel\PropelBundle\Tests\Fixtures\Model\Book"'); + $this->assertInstanceOf('Propel\Bundle\PropelBundle\Tests\Fixtures\Model\Book', $request->attributes->get('book'), + 'param "book" should be an instance of "Propel\Bundle\PropelBundle\Tests\Fixtures\Model\Book"'); } public function testParamConverterFindCamelCasedSlug() { $paramConverter = new PropelParamConverter(); $request = new Request(array(), array(), array('author_slug' => 'my-author', 'slug' => 'my-kewl-book', 'book' => null)); - $configuration = new ParamConverter(array('class' => 'Propel\PropelBundle\Tests\Fixtures\Model\Book', 'name' => 'book')); + $configuration = new ParamConverter(array('class' => 'Propel\Bundle\PropelBundle\Tests\Fixtures\Model\Book', 'name' => 'book')); $paramConverter->apply($request, $configuration); - $this->assertInstanceOf('Propel\PropelBundle\Tests\Fixtures\Model\Book',$request->attributes->get('book'), - 'param "book" should be an instance of "Propel\PropelBundle\Tests\Fixtures\Model\Book"'); + $this->assertInstanceOf('Propel\Bundle\PropelBundle\Tests\Fixtures\Model\Book',$request->attributes->get('book'), + 'param "book" should be an instance of "Propel\Bundle\PropelBundle\Tests\Fixtures\Model\Book"'); } /** @@ -104,7 +104,7 @@ class PropelParamConverterTest extends TestCase { $paramConverter = new PropelParamConverter(); $request = new Request(array(), array(), array('slug' => 'my-foo', 'book' => null)); - $configuration = new ParamConverter(array('class' => 'Propel\PropelBundle\Tests\Fixtures\Model\Book', 'name' => 'book')); + $configuration = new ParamConverter(array('class' => 'Propel\Bundle\PropelBundle\Tests\Fixtures\Model\Book', 'name' => 'book')); $paramConverter->apply($request, $configuration); } @@ -113,11 +113,11 @@ class PropelParamConverterTest extends TestCase $paramConverter = new PropelParamConverter(); $request = new Request(array(), array(), array('slug' => 'my-book', 'name' => 'foo', 'book' => null)); $configuration = new ParamConverter(array( - 'class' => 'Propel\PropelBundle\Tests\Fixtures\Model\Book', 'name' => 'book', + 'class' => 'Propel\Bundle\PropelBundle\Tests\Fixtures\Model\Book', 'name' => 'book', 'options' => array('exclude' => array('name')))); $paramConverter->apply($request, $configuration); - $this->assertInstanceOf('Propel\PropelBundle\Tests\Fixtures\Model\Book',$request->attributes->get('book'), - 'param "book" should be an instance of "Propel\PropelBundle\Tests\Fixtures\Model\Book"'); + $this->assertInstanceOf('Propel\Bundle\PropelBundle\Tests\Fixtures\Model\Book',$request->attributes->get('book'), + 'param "book" should be an instance of "Propel\Bundle\PropelBundle\Tests\Fixtures\Model\Book"'); } /** @@ -128,11 +128,11 @@ class PropelParamConverterTest extends TestCase $paramConverter = new PropelParamConverter(); $request = new Request(array(), array(), array('slug' => 'my-book', 'name' => 'foo', 'book' => null)); $configuration = new ParamConverter(array( - 'class' => 'Propel\PropelBundle\Tests\Fixtures\Model\Book', 'name' => 'book', + 'class' => 'Propel\Bundle\PropelBundle\Tests\Fixtures\Model\Book', 'name' => 'book', 'options' => array('exclude' => array('name', 'slug')))); $paramConverter->apply($request, $configuration); - $this->assertInstanceOf('Propel\PropelBundle\Tests\Fixtures\Model\Book',$request->attributes->get('book'), - 'param "book" should be an instance of "Propel\PropelBundle\Tests\Fixtures\Model\Book"'); + $this->assertInstanceOf('Propel\Bundle\PropelBundle\Tests\Fixtures\Model\Book',$request->attributes->get('book'), + 'param "book" should be an instance of "Propel\Bundle\PropelBundle\Tests\Fixtures\Model\Book"'); } /** @@ -143,11 +143,11 @@ class PropelParamConverterTest extends TestCase $paramConverter = new PropelParamConverter(); $request = new Request(array(), array(), array('id' => '1234', 'book' => null)); $configuration = new ParamConverter(array( - 'class' => 'Propel\PropelBundle\Tests\Fixtures\Model\Book', 'name' => 'book', + 'class' => 'Propel\Bundle\PropelBundle\Tests\Fixtures\Model\Book', 'name' => 'book', 'options' => array('exclude' => array('id')))); $paramConverter->apply($request, $configuration); - $this->assertInstanceOf('Propel\PropelBundle\Tests\Fixtures\Model\Book',$request->attributes->get('book'), - 'param "book" should be an instance of "Propel\PropelBundle\Tests\Fixtures\Model\Book"'); + $this->assertInstanceOf('Propel\Bundle\PropelBundle\Tests\Fixtures\Model\Book',$request->attributes->get('book'), + 'param "book" should be an instance of "Propel\Bundle\PropelBundle\Tests\Fixtures\Model\Book"'); } /** @@ -157,7 +157,7 @@ class PropelParamConverterTest extends TestCase { $paramConverter = new PropelParamConverter(); $request = new Request(array(), array(), array('book' => null)); - $configuration = new ParamConverter(array('class' => 'Propel\PropelBundle\Tests\Fixtures\Model\Book', 'name' => 'book')); + $configuration = new ParamConverter(array('class' => 'Propel\Bundle\PropelBundle\Tests\Fixtures\Model\Book', 'name' => 'book')); $paramConverter->apply($request, $configuration); } @@ -165,7 +165,7 @@ class PropelParamConverterTest extends TestCase { $paramConverter = new PropelParamConverter(); $request = new Request(array(), array(), array('book' => null)); - $configuration = new ParamConverter(array('class' => 'Propel\PropelBundle\Tests\Fixtures\Model\Book', 'name' => 'book')); + $configuration = new ParamConverter(array('class' => 'Propel\Bundle\PropelBundle\Tests\Fixtures\Model\Book', 'name' => 'book')); $configuration->setIsOptional(true); $paramConverter->apply($request, $configuration); @@ -177,26 +177,26 @@ class PropelParamConverterTest extends TestCase { $paramConverter = new PropelParamConverter(); $request = new Request(array(), array(), array('toto' => 1, 'book' => null)); - $configuration = new ParamConverter(array('class' => 'Propel\PropelBundle\Tests\Fixtures\Model\Book', + $configuration = new ParamConverter(array('class' => 'Propel\Bundle\PropelBundle\Tests\Fixtures\Model\Book', 'name' => 'book', 'options' => array('mapping' => array('toto' => 'id')) )); $paramConverter->apply($request, $configuration); - $this->assertInstanceOf('Propel\PropelBundle\Tests\Fixtures\Model\Book',$request->attributes->get('book'), - 'param "book" should be an instance of "Propel\PropelBundle\Tests\Fixtures\Model\Book"'); + $this->assertInstanceOf('Propel\Bundle\PropelBundle\Tests\Fixtures\Model\Book',$request->attributes->get('book'), + 'param "book" should be an instance of "Propel\Bundle\PropelBundle\Tests\Fixtures\Model\Book"'); } public function testParamConverterFindSlugWithMapping() { $paramConverter = new PropelParamConverter(); $request = new Request(array(), array(), array('slugParam_special' => 'my-book', 'book' => null)); - $configuration = new ParamConverter(array('class' => 'Propel\PropelBundle\Tests\Fixtures\Model\Book', + $configuration = new ParamConverter(array('class' => 'Propel\Bundle\PropelBundle\Tests\Fixtures\Model\Book', 'name' => 'book', 'options' => array('mapping' => array('slugParam_special' => 'slug')) )); $paramConverter->apply($request, $configuration); - $this->assertInstanceOf('Propel\PropelBundle\Tests\Fixtures\Model\Book',$request->attributes->get('book'), - 'param "book" should be an instance of "Propel\PropelBundle\Tests\Fixtures\Model\Book"'); + $this->assertInstanceOf('Propel\Bundle\PropelBundle\Tests\Fixtures\Model\Book',$request->attributes->get('book'), + 'param "book" should be an instance of "Propel\Bundle\PropelBundle\Tests\Fixtures\Model\Book"'); } public function testParamConvertWithOptionWith() @@ -206,7 +206,7 @@ class PropelParamConverterTest extends TestCase $paramConverter = new PropelParamConverter(); $request = new Request(array(), array(), array('id' => 1, 'book' => null)); $configuration = new ParamConverter(array( - 'class' => 'Propel\PropelBundle\Tests\Request\ParamConverter\MyBook', + 'class' => 'Propel\Bundle\PropelBundle\Tests\Request\ParamConverter\MyBook', 'name' => 'book', 'options' => array( 'with' => 'MyAuthor' @@ -217,13 +217,13 @@ class PropelParamConverterTest extends TestCase $paramConverter->apply($request, $configuration); $book = $request->attributes->get('book'); - $this->assertInstanceOf('Propel\PropelBundle\Tests\Request\ParamConverter\MyBook', $book, - 'param "book" should be an instance of "Propel\PropelBundle\Tests\Request\ParamConverter\MyBook"'); + $this->assertInstanceOf('Propel\Bundle\PropelBundle\Tests\Request\ParamConverter\MyBook', $book, + 'param "book" should be an instance of "Propel\Bundle\PropelBundle\Tests\Request\ParamConverter\MyBook"'); $this->assertEquals($nb +1, $this->con->getQueryCount(), 'only one query to get the book'); - $this->assertInstanceOf('Propel\PropelBundle\Tests\Request\ParamConverter\MyAuthor', $book->getMyAuthor(), - 'param "book" should be an instance of "Propel\PropelBundle\Tests\Request\ParamConverter\MyAuthor"'); + $this->assertInstanceOf('Propel\Bundle\PropelBundle\Tests\Request\ParamConverter\MyAuthor', $book->getMyAuthor(), + 'param "book" should be an instance of "Propel\Bundle\PropelBundle\Tests\Request\ParamConverter\MyAuthor"'); $this->assertEquals($nb +1, $this->con->getQueryCount(), 'no new query to get the author'); Propel::enableInstancePooling(); @@ -236,7 +236,7 @@ class PropelParamConverterTest extends TestCase $paramConverter = new PropelParamConverter(); $request = new Request(array(), array(), array('param1' => 10, 'author' => null)); $configuration = new ParamConverter(array( - 'class' => 'Propel\PropelBundle\Tests\Request\ParamConverter\MyAuthor', + 'class' => 'Propel\Bundle\PropelBundle\Tests\Request\ParamConverter\MyAuthor', 'name' => 'author', 'options' => array( 'with' => array(array('MyBook', 'left join')), @@ -248,8 +248,8 @@ class PropelParamConverterTest extends TestCase $paramConverter->apply($request, $configuration); $author = $request->attributes->get('author'); - $this->assertInstanceOf('Propel\PropelBundle\Tests\Request\ParamConverter\MyAuthor', $author, - 'param "author" should be an instance of "Propel\PropelBundle\Tests\Request\ParamConverter\MyAuthor"'); + $this->assertInstanceOf('Propel\Bundle\PropelBundle\Tests\Request\ParamConverter\MyAuthor', $author, + 'param "author" should be an instance of "Propel\Bundle\PropelBundle\Tests\Request\ParamConverter\MyAuthor"'); $this->assertEquals($nb + 1, $this->con->getQueryCount(), 'only one query to get the author'); @@ -267,7 +267,7 @@ class PropelParamConverterTest extends TestCase $paramConverter = new PropelParamConverter(); $request = new Request(array(), array(), array('id' => 10, 'author' => null)); $configuration = new ParamConverter(array( - 'class' => 'Propel\PropelBundle\Tests\Request\ParamConverter\MyAuthor', + 'class' => 'Propel\Bundle\PropelBundle\Tests\Request\ParamConverter\MyAuthor', 'name' => 'author', 'options' => array( 'with' => array(array('MyBook', 'left join')), @@ -278,8 +278,8 @@ class PropelParamConverterTest extends TestCase $paramConverter->apply($request, $configuration); $author = $request->attributes->get('author'); - $this->assertInstanceOf('Propel\PropelBundle\Tests\Request\ParamConverter\MyAuthor', $author, - 'param "author" should be an instance of "Propel\PropelBundle\Tests\Request\ParamConverter\MyAuthor"'); + $this->assertInstanceOf('Propel\Bundle\PropelBundle\Tests\Request\ParamConverter\MyAuthor', $author, + 'param "author" should be an instance of "Propel\Bundle\PropelBundle\Tests\Request\ParamConverter\MyAuthor"'); $this->assertEquals($nb + 1, $this->con->getQueryCount(), 'only one query to get the book'); @@ -323,7 +323,7 @@ class PropelParamConverterTest extends TestCase )); $configuration = new ParamConverter(array( - 'class' => 'Propel\PropelBundle\Tests\Request\ParamConverter\MyAuthor', + 'class' => 'Propel\Bundle\PropelBundle\Tests\Request\ParamConverter\MyAuthor', 'name' => 'author', 'options' => array(), )); @@ -331,15 +331,15 @@ class PropelParamConverterTest extends TestCase $paramConverter->apply($request, $configuration); $author = $request->attributes->get('author'); - $this->assertInstanceOf('Propel\PropelBundle\Tests\Request\ParamConverter\MyAuthor', $author, - 'param "author" should be an instance of "Propel\PropelBundle\Tests\Request\ParamConverter\MyAuthor"'); + $this->assertInstanceOf('Propel\Bundle\PropelBundle\Tests\Request\ParamConverter\MyAuthor', $author, + 'param "author" should be an instance of "Propel\Bundle\PropelBundle\Tests\Request\ParamConverter\MyAuthor"'); } protected function loadFixtures() { $schema = << +
@@ -357,7 +357,7 @@ class PropelParamConverterTest extends TestCase XML; - if (!class_exists('Propel\PropelBundle\Tests\Request\ParamConverter\MyAuthor')) { + if (!class_exists('Propel\Bundle\PropelBundle\Tests\Request\ParamConverter\MyAuthor')) { QuickBuilder::buildSchema($schema); } diff --git a/Tests/Security/Acl/AclProviderTest.php b/Tests/Security/Acl/AclProviderTest.php index 4b6fc83..2f363d2 100644 --- a/Tests/Security/Acl/AclProviderTest.php +++ b/Tests/Security/Acl/AclProviderTest.php @@ -8,21 +8,21 @@ * @license MIT License */ -namespace Propel\PropelBundle\Tests\Security\Acl; +namespace Propel\Bundle\PropelBundle\Tests\Security\Acl; use Propel\Runtime\Map\TableMap; -use Propel\PropelBundle\Model\Acl\SecurityIdentity; -use Propel\PropelBundle\Model\Acl\EntryQuery; -use Propel\PropelBundle\Model\Acl\Map\EntryTableMap; +use Propel\Bundle\PropelBundle\Model\Acl\SecurityIdentity; +use Propel\Bundle\PropelBundle\Model\Acl\EntryQuery; +use Propel\Bundle\PropelBundle\Model\Acl\Map\EntryTableMap; -use Propel\PropelBundle\Security\Acl\AclProvider; +use Propel\Bundle\PropelBundle\Security\Acl\AclProvider; use Symfony\Component\Security\Acl\Domain\ObjectIdentity; use Symfony\Component\Security\Acl\Domain\PermissionGrantingStrategy; -use Propel\PropelBundle\Tests\AclTestCase; -use Propel\PropelBundle\Tests\Fixtures\Acl\ArrayCache as AclCache; +use Propel\Bundle\PropelBundle\Tests\AclTestCase; +use Propel\Bundle\PropelBundle\Tests\Fixtures\Acl\ArrayCache as AclCache; /** * @author Toni Uebernickel @@ -59,7 +59,7 @@ class AclProviderTest extends AclTestCase $acl = $this->getAclProvider()->findAcl($this->getAclObjectIdentity(1), array($this->getRoleSecurityIdentity('ROLE_USER'))); $this->assertNotEmpty($acl); - $this->assertInstanceOf('Propel\PropelBundle\Security\Acl\Domain\Acl', $acl); + $this->assertInstanceOf('Propel\Bundle\PropelBundle\Security\Acl\Domain\Acl', $acl); $this->assertEmpty($acl->getFields()); $this->assertEmpty($acl->getClassAces()); @@ -106,8 +106,8 @@ class AclProviderTest extends AclTestCase $acl = $this->getAclProvider()->findAcl($this->getAclObjectIdentity(2), array($this->getRoleSecurityIdentity('ROLE_USER'))); $parent = $acl->getParentAcl(); - $this->assertInstanceOf('Propel\PropelBundle\Security\Acl\Domain\Acl', $acl); - $this->assertInstanceOf('Propel\PropelBundle\Security\Acl\Domain\Acl', $parent); + $this->assertInstanceOf('Propel\Bundle\PropelBundle\Security\Acl\Domain\Acl', $acl); + $this->assertInstanceOf('Propel\Bundle\PropelBundle\Security\Acl\Domain\Acl', $parent); $aces = $acl->getObjectAces(); $parentAces = $parent->getObjectAces(); diff --git a/Tests/Security/Acl/AuditableAclProviderTest.php b/Tests/Security/Acl/AuditableAclProviderTest.php index 6e22e56..87e47a0 100644 --- a/Tests/Security/Acl/AuditableAclProviderTest.php +++ b/Tests/Security/Acl/AuditableAclProviderTest.php @@ -8,11 +8,11 @@ * @license MIT License */ -namespace Propel\PropelBundle\Tests\Security\Acl; +namespace Propel\Bundle\PropelBundle\Tests\Security\Acl; -use Propel\PropelBundle\Model\Acl\EntryQuery; -use Propel\PropelBundle\Security\Acl\AuditableAclProvider; -use Propel\PropelBundle\Tests\AclTestCase; +use Propel\Bundle\PropelBundle\Model\Acl\EntryQuery; +use Propel\Bundle\PropelBundle\Security\Acl\AuditableAclProvider; +use Propel\Bundle\PropelBundle\Tests\AclTestCase; use Symfony\Component\Security\Acl\Domain\PermissionGrantingStrategy; @@ -26,7 +26,7 @@ class AuditableAclProviderTest extends AclTestCase $acl = $this->getAclProvider()->createAcl($this->getAclObjectIdentity(1)); $this->assertNotEmpty($acl); - $this->assertInstanceOf('Propel\PropelBundle\Security\Acl\Domain\AuditableAcl', $acl); + $this->assertInstanceOf('Propel\Bundle\PropelBundle\Security\Acl\Domain\AuditableAcl', $acl); $this->assertEquals(1, $acl->getId()); } diff --git a/Tests/Security/Acl/Domain/AclTest.php b/Tests/Security/Acl/Domain/AclTest.php index 33e5cb3..ee6726b 100644 --- a/Tests/Security/Acl/Domain/AclTest.php +++ b/Tests/Security/Acl/Domain/AclTest.php @@ -8,14 +8,14 @@ * @license MIT License */ -namespace Propel\PropelBundle\Tests\Security\Acl\Domain; +namespace Propel\Bundle\PropelBundle\Tests\Security\Acl\Domain; use Propel\Runtime\Collection\ObjectCollection; -use Propel\PropelBundle\Model\Acl\Entry; -use Propel\PropelBundle\Model\Acl\SecurityIdentity; -use Propel\PropelBundle\Security\Acl\Domain\Acl; -use Propel\PropelBundle\Tests\AclTestCase; +use Propel\Bundle\PropelBundle\Model\Acl\Entry; +use Propel\Bundle\PropelBundle\Model\Acl\SecurityIdentity; +use Propel\Bundle\PropelBundle\Security\Acl\Domain\Acl; +use Propel\Bundle\PropelBundle\Tests\AclTestCase; use Symfony\Component\Security\Acl\Domain\PermissionGrantingStrategy; @@ -27,7 +27,7 @@ class AclTest extends AclTestCase public function testConstructorInvalidCollection() { $collection = new ObjectCollection(); - $collection->setModel('Propel\PropelBundle\Model\Acl\AclClass'); + $collection->setModel('Propel\Bundle\PropelBundle\Model\Acl\AclClass'); $this->setExpectedException('Symfony\Component\Security\Acl\Exception\Exception'); new Acl($collection, $this->getAclObjectIdentity(), new PermissionGrantingStrategy()); @@ -36,7 +36,7 @@ class AclTest extends AclTestCase public function testConstructorEmptyCollection() { $collection = new ObjectCollection(); - $collection->setModel('Propel\PropelBundle\Model\Acl\Entry'); + $collection->setModel('Propel\Bundle\PropelBundle\Model\Acl\Entry'); $aclObj = $this->getAclObjectIdentity(); $acl = new Acl($collection, $aclObj, new PermissionGrantingStrategy()); @@ -55,7 +55,7 @@ class AclTest extends AclTestCase public function testConstructorWithAces() { $collection = new ObjectCollection(); - $collection->setModel('Propel\PropelBundle\Model\Acl\Entry'); + $collection->setModel('Propel\Bundle\PropelBundle\Model\Acl\Entry'); $obj = $this->createModelObjectIdentity(1); @@ -107,10 +107,10 @@ class AclTest extends AclTestCase $classFieldAces = $acl->getClassFieldAces('name'); $objectFieldAces = $acl->getObjectFieldAces('name'); - $this->assertInstanceOf('Propel\PropelBundle\Security\Acl\Domain\Entry', $classAces[0]); - $this->assertInstanceOf('Propel\PropelBundle\Security\Acl\Domain\Entry', $objectAces[0]); - $this->assertInstanceOf('Propel\PropelBundle\Security\Acl\Domain\FieldEntry', $classFieldAces[0]); - $this->assertInstanceOf('Propel\PropelBundle\Security\Acl\Domain\FieldEntry', $objectFieldAces[0]); + $this->assertInstanceOf('Propel\Bundle\PropelBundle\Security\Acl\Domain\Entry', $classAces[0]); + $this->assertInstanceOf('Propel\Bundle\PropelBundle\Security\Acl\Domain\Entry', $objectAces[0]); + $this->assertInstanceOf('Propel\Bundle\PropelBundle\Security\Acl\Domain\FieldEntry', $classFieldAces[0]); + $this->assertInstanceOf('Propel\Bundle\PropelBundle\Security\Acl\Domain\FieldEntry', $objectFieldAces[0]); $this->assertSame($acl, $classAces[0]->getAcl()); $this->assertSame($acl, $objectAces[0]->getAcl()); @@ -124,7 +124,7 @@ class AclTest extends AclTestCase public function testIsSidLoadedNoneLoaded() { $collection = new ObjectCollection(); - $collection->setModel('Propel\PropelBundle\Model\Acl\Entry'); + $collection->setModel('Propel\Bundle\PropelBundle\Model\Acl\Entry'); $acl = new Acl($collection, $this->getAclObjectIdentity(), new PermissionGrantingStrategy()); $this->assertFalse($acl->isSidLoaded($this->getRoleSecurityIdentity())); @@ -133,7 +133,7 @@ class AclTest extends AclTestCase public function testIsSidLoadedInvalid() { $collection = new ObjectCollection(); - $collection->setModel('Propel\PropelBundle\Model\Acl\Entry'); + $collection->setModel('Propel\Bundle\PropelBundle\Model\Acl\Entry'); $aclObj = $this->getAclObjectIdentity(); $acl = new Acl($collection, $aclObj, new PermissionGrantingStrategy()); @@ -145,7 +145,7 @@ class AclTest extends AclTestCase public function testIsGrantedNoAces() { $collection = new ObjectCollection(); - $collection->setModel('Propel\PropelBundle\Model\Acl\Entry'); + $collection->setModel('Propel\Bundle\PropelBundle\Model\Acl\Entry'); $acl = new Acl($collection, $this->getAclObjectIdentity(), new PermissionGrantingStrategy()); @@ -156,7 +156,7 @@ class AclTest extends AclTestCase public function testIsGrantedNoMatchingSecurityIdentity() { $collection = new ObjectCollection(); - $collection->setModel('Propel\PropelBundle\Model\Acl\Entry'); + $collection->setModel('Propel\Bundle\PropelBundle\Model\Acl\Entry'); $entry = $this->createEntry(); $entry @@ -174,7 +174,7 @@ class AclTest extends AclTestCase public function testIsFieldGrantedNoAces() { $collection = new ObjectCollection(); - $collection->setModel('Propel\PropelBundle\Model\Acl\Entry'); + $collection->setModel('Propel\Bundle\PropelBundle\Model\Acl\Entry'); $acl = new Acl($collection, $this->getAclObjectIdentity(), new PermissionGrantingStrategy()); @@ -185,7 +185,7 @@ class AclTest extends AclTestCase public function testSerializeUnserialize() { $collection = new ObjectCollection(); - $collection->setModel('Propel\PropelBundle\Model\Acl\Entry'); + $collection->setModel('Propel\Bundle\PropelBundle\Model\Acl\Entry'); $entry = $this->createEntry(); $entry @@ -200,7 +200,7 @@ class AclTest extends AclTestCase $this->assertNotEmpty($serialized); $this->assertNotEmpty($unserialized); - $this->assertInstanceOf('Propel\PropelBundle\Security\Acl\Domain\Acl', $unserialized); + $this->assertInstanceOf('Propel\Bundle\PropelBundle\Security\Acl\Domain\Acl', $unserialized); $this->assertEquals($serialized, serialize($unserialized)); } } diff --git a/Tests/Security/Acl/Domain/AuditableAclTest.php b/Tests/Security/Acl/Domain/AuditableAclTest.php index 00de69f..3fd362c 100644 --- a/Tests/Security/Acl/Domain/AuditableAclTest.php +++ b/Tests/Security/Acl/Domain/AuditableAclTest.php @@ -8,14 +8,14 @@ * @license MIT License */ -namespace Propel\PropelBundle\Tests\Security\Acl\Domain; +namespace Propel\Bundle\PropelBundle\Tests\Security\Acl\Domain; use Propel\Runtime\Collection\ObjectCollection; -use Propel\PropelBundle\Model\Acl\Entry; -use Propel\PropelBundle\Model\Acl\SecurityIdentity; -use Propel\PropelBundle\Security\Acl\Domain\AuditableAcl; -use Propel\PropelBundle\Tests\AclTestCase; +use Propel\Bundle\PropelBundle\Model\Acl\Entry; +use Propel\Bundle\PropelBundle\Model\Acl\SecurityIdentity; +use Propel\Bundle\PropelBundle\Security\Acl\Domain\AuditableAcl; +use Propel\Bundle\PropelBundle\Tests\AclTestCase; use Symfony\Component\Security\Acl\Domain\PermissionGrantingStrategy; @@ -27,7 +27,7 @@ class AuditableAclTest extends AclTestCase public function testUpdateAuditingInvalidIndex() { $collection = new ObjectCollection(); - $collection->setModel('Propel\PropelBundle\Model\Acl\Entry'); + $collection->setModel('Propel\Bundle\PropelBundle\Model\Acl\Entry'); $acl = new AuditableAcl($collection, $this->getAclObjectIdentity(), new PermissionGrantingStrategy()); @@ -38,7 +38,7 @@ class AuditableAclTest extends AclTestCase public function testUpdateAuditingInvalidField() { $collection = new ObjectCollection(); - $collection->setModel('Propel\PropelBundle\Model\Acl\Entry'); + $collection->setModel('Propel\Bundle\PropelBundle\Model\Acl\Entry'); $obj = $this->createModelObjectIdentity(1); $entry = $this->createEntry(); @@ -58,7 +58,7 @@ class AuditableAclTest extends AclTestCase public function testUpdateAuditingInvalidFlag() { $collection = new ObjectCollection(); - $collection->setModel('Propel\PropelBundle\Model\Acl\Entry'); + $collection->setModel('Propel\Bundle\PropelBundle\Model\Acl\Entry'); $obj = $this->createModelObjectIdentity(1); $entry = $this->createEntry(); @@ -77,7 +77,7 @@ class AuditableAclTest extends AclTestCase public function testUpdateObjectAuditing() { $collection = new ObjectCollection(); - $collection->setModel('Propel\PropelBundle\Model\Acl\Entry'); + $collection->setModel('Propel\Bundle\PropelBundle\Model\Acl\Entry'); $obj = $this->createModelObjectIdentity(1); $entry = $this->createEntry(); @@ -119,7 +119,7 @@ class AuditableAclTest extends AclTestCase public function testUpdateObjectFieldAuditing() { $collection = new ObjectCollection(); - $collection->setModel('Propel\PropelBundle\Model\Acl\Entry'); + $collection->setModel('Propel\Bundle\PropelBundle\Model\Acl\Entry'); $obj = $this->createModelObjectIdentity(1); $entry = $this->createEntry(); @@ -153,7 +153,7 @@ class AuditableAclTest extends AclTestCase public function testUpdateClassAuditing() { $collection = new ObjectCollection(); - $collection->setModel('Propel\PropelBundle\Model\Acl\Entry'); + $collection->setModel('Propel\Bundle\PropelBundle\Model\Acl\Entry'); $entry = $this->createEntry(); $entry @@ -184,7 +184,7 @@ class AuditableAclTest extends AclTestCase public function testUpdateClassFieldAuditing() { $collection = new ObjectCollection(); - $collection->setModel('Propel\PropelBundle\Model\Acl\Entry'); + $collection->setModel('Propel\Bundle\PropelBundle\Model\Acl\Entry'); $entry = $this->createEntry(); $entry diff --git a/Tests/Security/Acl/Domain/EntryTest.php b/Tests/Security/Acl/Domain/EntryTest.php index c35e7bb..8d161a4 100644 --- a/Tests/Security/Acl/Domain/EntryTest.php +++ b/Tests/Security/Acl/Domain/EntryTest.php @@ -8,14 +8,14 @@ * @license MIT License */ -namespace Propel\PropelBundle\Tests\Security\Acl\Domain; +namespace Propel\Bundle\PropelBundle\Tests\Security\Acl\Domain; use Propel\Runtime\Collection\ObjectCollection; -use Propel\PropelBundle\Model\Acl\SecurityIdentity; -use Propel\PropelBundle\Security\Acl\Domain\Acl; -use Propel\PropelBundle\Security\Acl\Domain\Entry; -use Propel\PropelBundle\Tests\AclTestCase; +use Propel\Bundle\PropelBundle\Model\Acl\SecurityIdentity; +use Propel\Bundle\PropelBundle\Security\Acl\Domain\Acl; +use Propel\Bundle\PropelBundle\Security\Acl\Domain\Entry; +use Propel\Bundle\PropelBundle\Tests\AclTestCase; use Symfony\Component\Security\Acl\Domain\PermissionGrantingStrategy; @@ -27,7 +27,7 @@ class EntryTest extends AclTestCase public function testConstruct() { $collection = new ObjectCollection(); - $collection->setModel('Propel\PropelBundle\Model\Acl\Entry'); + $collection->setModel('Propel\Bundle\PropelBundle\Model\Acl\Entry'); $acl = new Acl($collection, $this->getAclObjectIdentity(), new PermissionGrantingStrategy()); $model = $this->createEntry(); @@ -56,7 +56,7 @@ class EntryTest extends AclTestCase $this->assertNotEmpty($serialized); $this->assertNotEmpty($unserialized); - $this->assertInstanceOf('Propel\PropelBundle\Security\Acl\Domain\Entry', $unserialized); + $this->assertInstanceOf('Propel\Bundle\PropelBundle\Security\Acl\Domain\Entry', $unserialized); $this->assertEquals($entry->getMask(), $unserialized->getMask()); $this->assertEquals($entry->isGranting(), $unserialized->isGranting()); diff --git a/Tests/Security/Acl/Domain/FieldEntryTest.php b/Tests/Security/Acl/Domain/FieldEntryTest.php index b9257b2..05c8239 100644 --- a/Tests/Security/Acl/Domain/FieldEntryTest.php +++ b/Tests/Security/Acl/Domain/FieldEntryTest.php @@ -8,14 +8,14 @@ * @license MIT License */ -namespace Propel\PropelBundle\Tests\Security\Acl\Domain; +namespace Propel\Bundle\PropelBundle\Tests\Security\Acl\Domain; use Propel\Runtime\Collection\ObjectCollection; -use Propel\PropelBundle\Model\Acl\SecurityIdentity; -use Propel\PropelBundle\Security\Acl\Domain\Acl; -use Propel\PropelBundle\Security\Acl\Domain\FieldEntry; -use Propel\PropelBundle\Tests\AclTestCase; +use Propel\Bundle\PropelBundle\Model\Acl\SecurityIdentity; +use Propel\Bundle\PropelBundle\Security\Acl\Domain\Acl; +use Propel\Bundle\PropelBundle\Security\Acl\Domain\FieldEntry; +use Propel\Bundle\PropelBundle\Tests\AclTestCase; use Symfony\Component\Security\Acl\Domain\PermissionGrantingStrategy; @@ -27,7 +27,7 @@ class FieldEntryTest extends AclTestCase public function testConstruct() { $collection = new ObjectCollection(); - $collection->setModel('Propel\PropelBundle\Model\Acl\Entry'); + $collection->setModel('Propel\Bundle\PropelBundle\Model\Acl\Entry'); $acl = new Acl($collection, $this->getAclObjectIdentity(), new PermissionGrantingStrategy()); $model = $this->createEntry(); @@ -58,7 +58,7 @@ class FieldEntryTest extends AclTestCase $this->assertNotEmpty($serialized); $this->assertNotEmpty($unserialized); - $this->assertInstanceOf('Propel\PropelBundle\Security\Acl\Domain\FieldEntry', $unserialized); + $this->assertInstanceOf('Propel\Bundle\PropelBundle\Security\Acl\Domain\FieldEntry', $unserialized); $this->assertEquals($entry->getMask(), $unserialized->getMask()); $this->assertEquals($entry->isGranting(), $unserialized->isGranting()); diff --git a/Tests/Security/Acl/Domain/MutableAclTest.php b/Tests/Security/Acl/Domain/MutableAclTest.php index 1bae03c..bd1f551 100644 --- a/Tests/Security/Acl/Domain/MutableAclTest.php +++ b/Tests/Security/Acl/Domain/MutableAclTest.php @@ -8,14 +8,14 @@ * @license MIT License */ -namespace Propel\PropelBundle\Tests\Security\Acl\Domain; +namespace Propel\Bundle\PropelBundle\Tests\Security\Acl\Domain; use Propel\Runtime\Collection\ObjectCollection; -use Propel\PropelBundle\Model\Acl\Entry; -use Propel\PropelBundle\Model\Acl\SecurityIdentity; -use Propel\PropelBundle\Security\Acl\Domain\MutableAcl; -use Propel\PropelBundle\Tests\AclTestCase; +use Propel\Bundle\PropelBundle\Model\Acl\Entry; +use Propel\Bundle\PropelBundle\Model\Acl\SecurityIdentity; +use Propel\Bundle\PropelBundle\Security\Acl\Domain\MutableAcl; +use Propel\Bundle\PropelBundle\Tests\AclTestCase; use Symfony\Component\Security\Acl\Model\AclInterface; use Symfony\Component\Security\Acl\Domain\PermissionGrantingStrategy; @@ -28,7 +28,7 @@ class MutableAclTest extends AclTestCase public function testConstructorInvalidCollection() { $collection = new ObjectCollection(); - $collection->setModel('Propel\PropelBundle\Model\Acl\AclClass'); + $collection->setModel('Propel\Bundle\PropelBundle\Model\Acl\AclClass'); $this->setExpectedException('Symfony\Component\Security\Acl\Exception\Exception'); new MutableAcl($collection, $this->getAclObjectIdentity(), new PermissionGrantingStrategy(), array(), null, false, $this->con); @@ -226,7 +226,7 @@ class MutableAclTest extends AclTestCase public function testUpdatePersistedAceKeepsId() { $collection = new ObjectCollection(); - $collection->setModel('Propel\PropelBundle\Model\Acl\Entry'); + $collection->setModel('Propel\Bundle\PropelBundle\Model\Acl\Entry'); $entry = $this->createEntry(); $entry @@ -247,7 +247,7 @@ class MutableAclTest extends AclTestCase public function testSerializeUnserialize() { $collection = new ObjectCollection(); - $collection->setModel('Propel\PropelBundle\Model\Acl\Entry'); + $collection->setModel('Propel\Bundle\PropelBundle\Model\Acl\Entry'); $entry = $this->createEntry(); $entry @@ -262,14 +262,14 @@ class MutableAclTest extends AclTestCase $this->assertNotEmpty($serialized); $this->assertNotEmpty($unserialized); - $this->assertInstanceOf('Propel\PropelBundle\Security\Acl\Domain\MutableAcl', $unserialized); + $this->assertInstanceOf('Propel\Bundle\PropelBundle\Security\Acl\Domain\MutableAcl', $unserialized); $this->assertEquals($serialized, serialize($unserialized)); } protected function createEmptyAcl($identifier = 1, array $securityIdentities = array(), AclInterface $parentAcl = null, $inherited = null) { $collection = new ObjectCollection(); - $collection->setModel('Propel\PropelBundle\Model\Acl\Entry'); + $collection->setModel('Propel\Bundle\PropelBundle\Model\Acl\Entry'); return new MutableAcl($collection, $this->getAclObjectIdentity($identifier), new PermissionGrantingStrategy(), $securityIdentities, $parentAcl, $inherited, $this->con); } diff --git a/Tests/Security/Acl/MutableAclProviderTest.php b/Tests/Security/Acl/MutableAclProviderTest.php index 9edc309..5ecd369 100644 --- a/Tests/Security/Acl/MutableAclProviderTest.php +++ b/Tests/Security/Acl/MutableAclProviderTest.php @@ -8,15 +8,15 @@ * @license MIT License */ -namespace Propel\PropelBundle\Tests\Security\Acl; +namespace Propel\Bundle\PropelBundle\Tests\Security\Acl; use Propel\Runtime\ActiveQuery\Criteria; -use Propel\PropelBundle\Model\Acl\EntryQuery; -use Propel\PropelBundle\Model\Acl\ObjectIdentityQuery; +use Propel\Bundle\PropelBundle\Model\Acl\EntryQuery; +use Propel\Bundle\PropelBundle\Model\Acl\ObjectIdentityQuery; -use Propel\PropelBundle\Tests\AclTestCase; -use Propel\PropelBundle\Tests\Fixtures\Acl\ArrayCache as AclCache; +use Propel\Bundle\PropelBundle\Tests\AclTestCase; +use Propel\Bundle\PropelBundle\Tests\Fixtures\Acl\ArrayCache as AclCache; /** * @author Toni Uebernickel @@ -28,7 +28,7 @@ class MutableAclProviderTest extends AclTestCase $acl = $this->getAclProvider()->createAcl($this->getAclObjectIdentity(1)); $this->assertNotEmpty($acl); - $this->assertInstanceOf('Propel\PropelBundle\Security\Acl\Domain\MutableAcl', $acl); + $this->assertInstanceOf('Propel\Bundle\PropelBundle\Security\Acl\Domain\MutableAcl', $acl); $this->assertEquals(1, $acl->getId()); $this->assertEmpty($acl->getClassAces()); @@ -54,13 +54,13 @@ class MutableAclProviderTest extends AclTestCase $this->assertEquals(2, EntryQuery::create()->count($this->con)); $acl = $this->getAclProvider()->findAcl($this->getAclObjectIdentity(1)); - $this->assertInstanceOf('Propel\PropelBundle\Security\Acl\Domain\MutableAcl', $acl); + $this->assertInstanceOf('Propel\Bundle\PropelBundle\Security\Acl\Domain\MutableAcl', $acl); $objAces = $acl->getObjectAces(); $this->assertCount(1, $objAces); $entry = $objAces[0]; - $this->assertInstanceOf('Propel\PropelBundle\Security\Acl\Domain\Entry', $entry); + $this->assertInstanceOf('Propel\Bundle\PropelBundle\Security\Acl\Domain\Entry', $entry); $this->assertEquals(64, $entry->getMask()); $this->assertEquals($this->getRoleSecurityIdentity(), $entry->getSecurityIdentity()); @@ -68,7 +68,7 @@ class MutableAclProviderTest extends AclTestCase $this->assertCount(1, $classFieldAces); $entry = $classFieldAces[0]; - $this->assertInstanceOf('Propel\PropelBundle\Security\Acl\Domain\FieldEntry', $entry); + $this->assertInstanceOf('Propel\Bundle\PropelBundle\Security\Acl\Domain\FieldEntry', $entry); $this->assertEquals('name', $entry->getField()); $this->assertEquals(128, $entry->getMask()); $this->assertEquals($this->getRoleSecurityIdentity('ROLE_ADMIN'), $entry->getSecurityIdentity()); diff --git a/Tests/Security/User/PropelUserProviderTest.php b/Tests/Security/User/PropelUserProviderTest.php index d0c667f..d835467 100644 --- a/Tests/Security/User/PropelUserProviderTest.php +++ b/Tests/Security/User/PropelUserProviderTest.php @@ -8,13 +8,13 @@ * @license MIT License */ -namespace Propel\PropelBundle\Tests\Security\User; +namespace Propel\Bundle\PropelBundle\Tests\Security\User; use Propel\Generator\Util\QuickBuilder; -use Propel\PropelBundle\Security\User\PropelUserProvider; -use Propel\PropelBundle\Tests\Fixtures\Model\User; -use Propel\PropelBundle\Tests\TestCase; +use Propel\Bundle\PropelBundle\Security\User\PropelUserProvider; +use Propel\Bundle\PropelBundle\Tests\Fixtures\Model\User; +use Propel\Bundle\PropelBundle\Tests\TestCase; /** * @author William Durand @@ -24,7 +24,7 @@ class PropelUserProviderTest extends TestCase public function setUp() { $schema = << +
@@ -54,7 +54,7 @@ SCHEMA; $user2->setUsername('user2'); $user2->save(); - $provider = new PropelUserProvider('Propel\PropelBundle\Tests\Fixtures\Model\User', 'username'); + $provider = new PropelUserProvider('Propel\Bundle\PropelBundle\Tests\Fixtures\Model\User', 'username'); // try to change the user identity $user1->setUsername('user2'); diff --git a/Tests/TestCase.php b/Tests/TestCase.php index d1a2ff3..cd12fec 100644 --- a/Tests/TestCase.php +++ b/Tests/TestCase.php @@ -8,7 +8,7 @@ * @license MIT License */ -namespace Propel\PropelBundle\Tests; +namespace Propel\Bundle\PropelBundle\Tests; use Symfony\Component\DependencyInjection\ContainerBuilder; use Symfony\Component\DependencyInjection\Definition; diff --git a/Tests/Util/PropelInflectorTest.php b/Tests/Util/PropelInflectorTest.php index 0ebfa02..4068bf3 100644 --- a/Tests/Util/PropelInflectorTest.php +++ b/Tests/Util/PropelInflectorTest.php @@ -8,10 +8,10 @@ * @license MIT License */ -namespace Propel\PropelBundle\Tests\Util; +namespace Propel\Bundle\PropelBundle\Tests\Util; -use Propel\PropelBundle\Tests\TestCase; -use Propel\PropelBundle\Util\PropelInflector; +use Propel\Bundle\PropelBundle\Tests\TestCase; +use Propel\Bundle\PropelBundle\Util\PropelInflector; /** * @author William Durand diff --git a/Twig/Extension/SyntaxExtension.php b/Twig/Extension/SyntaxExtension.php index f787908..95c63fa 100644 --- a/Twig/Extension/SyntaxExtension.php +++ b/Twig/Extension/SyntaxExtension.php @@ -8,7 +8,7 @@ * @license MIT License */ -namespace Propel\PropelBundle\Twig\Extension; +namespace Propel\Bundle\PropelBundle\Twig\Extension; /** * SyntaxExtension class diff --git a/Util/PropelInflector.php b/Util/PropelInflector.php index a9765d6..b6f4ce3 100644 --- a/Util/PropelInflector.php +++ b/Util/PropelInflector.php @@ -8,7 +8,7 @@ * @license MIT License */ -namespace Propel\PropelBundle\Util; +namespace Propel\Bundle\PropelBundle\Util; /** * The Propel inflector class provides methods for inflecting text. diff --git a/Validator/Constraints/UniqueObject.php b/Validator/Constraints/UniqueObject.php index 463aef5..a071b14 100644 --- a/Validator/Constraints/UniqueObject.php +++ b/Validator/Constraints/UniqueObject.php @@ -8,7 +8,7 @@ * @license MIT License */ -namespace Propel\PropelBundle\Validator\Constraints; +namespace Propel\Bundle\PropelBundle\Validator\Constraints; use Symfony\Component\Validator\Constraint; use Symfony\Component\Validator\Exception\ConstraintDefinitionException; diff --git a/Validator/Constraints/UniqueObjectValidator.php b/Validator/Constraints/UniqueObjectValidator.php index fe28085..b210882 100644 --- a/Validator/Constraints/UniqueObjectValidator.php +++ b/Validator/Constraints/UniqueObjectValidator.php @@ -8,7 +8,7 @@ * @license MIT License */ -namespace Propel\PropelBundle\Validator\Constraints; +namespace Propel\Bundle\PropelBundle\Validator\Constraints; use Propel\Runtime\Map\TableMap; diff --git a/composer.json b/composer.json index d39994b..3f26276 100644 --- a/composer.json +++ b/composer.json @@ -10,7 +10,7 @@ }], "autoload": { - "psr-4": { "Propel\\PropelBundle\\": "" }, + "psr-4": { "Propel\\Bundle\\PropelBundle\\": "" }, "exclude-from-classmap": [ "Tests/" ] }, From 2caf5068e78c5693cda74bb9ff5ae268d3481ac9 Mon Sep 17 00:00:00 2001 From: Gregor Harlan Date: Thu, 11 Feb 2016 19:48:07 +0100 Subject: [PATCH 4/6] travis: check symfony 3.0 --- .travis.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.travis.yml b/.travis.yml index b16db99..f3cd49a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -16,12 +16,16 @@ env: - COMPOSER_FLAGS="--prefer-lowest" - SYMFONY_VERSION="^2.8.2" - SYMFONY_VERSION="^2.8.2" COMPOSER_FLAGS="--prefer-lowest" + - SYMFONY_VERSION="^3.0.0" + - SYMFONY_VERSION="^3.0.0" COMPOSER_FLAGS="--prefer-lowest" matrix: fast_finish: true allow_failures: - php: hhvm + - SYMFONY_VERSION="^3.0.0" + - SYMFONY_VERSION="^3.0.0" COMPOSER_FLAGS="--prefer-lowest" before_install: - phpenv config-rm xdebug.ini From 28f18fc4e533075bd0e446b388d8308e87c43b88 Mon Sep 17 00:00:00 2001 From: Gregor Harlan Date: Thu, 11 Feb 2016 19:48:20 +0100 Subject: [PATCH 5/6] require dev-master of propel --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 3f26276..a0ad013 100644 --- a/composer.json +++ b/composer.json @@ -15,7 +15,7 @@ }, "require": { - "propel/propel": "2.*@dev", + "propel/propel": "dev-master", "symfony/symfony": "^2.8" }, "require-dev": { From 09db2ca042fdbead9bdaf628fff26bd74cfd9935 Mon Sep 17 00:00:00 2001 From: Gregor Harlan Date: Thu, 11 Feb 2016 20:15:00 +0100 Subject: [PATCH 6/6] corrected allow_failures part --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index f3cd49a..3c2272b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -24,8 +24,8 @@ matrix: allow_failures: - php: hhvm - - SYMFONY_VERSION="^3.0.0" - - SYMFONY_VERSION="^3.0.0" COMPOSER_FLAGS="--prefer-lowest" + - env: SYMFONY_VERSION="^3.0.0" + - env: SYMFONY_VERSION="^3.0.0" COMPOSER_FLAGS="--prefer-lowest" before_install: - phpenv config-rm xdebug.ini