diff --git a/composer.json b/composer.json index fdc636b..543fa6e 100644 --- a/composer.json +++ b/composer.json @@ -19,13 +19,13 @@ }, "autoload": { "psr-4": { - "Web2PrintToolsBundle\\": "src/" + "Pimcore\\Bundle\\Web2PrintToolsBundle\\": "src/" } }, "extra": { "pimcore": { "bundles": [ - "Web2PrintToolsBundle\\Web2PrintToolsBundle" + "Pimcore\\Bundle\\Web2PrintToolsBundle" ] } } diff --git a/src/Controller/AdminController.php b/src/Controller/AdminController.php index 2daa01a..b21dccb 100644 --- a/src/Controller/AdminController.php +++ b/src/Controller/AdminController.php @@ -13,15 +13,15 @@ * @license http://www.pimcore.org/license GPLv3 and PCL */ -namespace Web2PrintToolsBundle\Controller; +namespace Pimcore\Bundle\Web2PrintToolsBundle\Controller; use Exception; +use Pimcore\Bundle\Web2PrintToolsBundle\FavoriteOutputDefinition; use Pimcore\Controller\Traits\JsonHelperTrait; use Pimcore\Controller\UserAwareController; use Pimcore\Db; use Symfony\Component\HttpFoundation\Request; use Symfony\Component\Routing\Annotation\Route; -use Web2PrintToolsBundle\FavoriteOutputDefinition; /** * Class AdminController diff --git a/src/DependencyInjection/Web2PrintToolsExtension.php b/src/DependencyInjection/Web2PrintToolsExtension.php index d7f29d0..0d61ac2 100644 --- a/src/DependencyInjection/Web2PrintToolsExtension.php +++ b/src/DependencyInjection/Web2PrintToolsExtension.php @@ -13,7 +13,7 @@ * @license http://www.pimcore.org/license GPLv3 and PCL */ -namespace Web2PrintToolsBundle\DependencyInjection; +namespace Pimcore\Bundle\Web2PrintToolsBundle\DependencyInjection; use Symfony\Component\Config\FileLocator; use Symfony\Component\DependencyInjection\ContainerBuilder; diff --git a/src/FavoriteOutputDefinition.php b/src/FavoriteOutputDefinition.php index 2cd99ac..18a1ae6 100644 --- a/src/FavoriteOutputDefinition.php +++ b/src/FavoriteOutputDefinition.php @@ -13,7 +13,7 @@ * @license http://www.pimcore.org/license GPLv3 and PCL */ -namespace Web2PrintToolsBundle; +namespace Pimcore\Bundle\Web2PrintToolsBundle; use Pimcore\Logger; diff --git a/src/FavoriteOutputDefinition/Dao.php b/src/FavoriteOutputDefinition/Dao.php index adc8387..4e0c121 100644 --- a/src/FavoriteOutputDefinition/Dao.php +++ b/src/FavoriteOutputDefinition/Dao.php @@ -13,10 +13,10 @@ * @license http://www.pimcore.org/license GPLv3 and PCL */ -namespace Web2PrintToolsBundle\FavoriteOutputDefinition; +namespace Pimcore\Bundle\Web2PrintToolsBundle\FavoriteOutputDefinition; +use Pimcore\Bundle\Web2PrintToolsBundle\FavoriteOutputDefinition; use Pimcore\Db\Helper; -use Web2PrintToolsBundle\FavoriteOutputDefinition; /** * @property FavoriteOutputDefinition $model diff --git a/src/FavoriteOutputDefinition/Listing.php b/src/FavoriteOutputDefinition/Listing.php index 4195044..d8461e9 100644 --- a/src/FavoriteOutputDefinition/Listing.php +++ b/src/FavoriteOutputDefinition/Listing.php @@ -13,7 +13,7 @@ * @license http://www.pimcore.org/license GPLv3 and PCL */ -namespace Web2PrintToolsBundle\FavoriteOutputDefinition; +namespace Pimcore\Bundle\Web2PrintToolsBundle\FavoriteOutputDefinition; /** * @method self|null load() diff --git a/src/FavoriteOutputDefinition/Listing/Dao.php b/src/FavoriteOutputDefinition/Listing/Dao.php index d85a46c..ed5d2e0 100644 --- a/src/FavoriteOutputDefinition/Listing/Dao.php +++ b/src/FavoriteOutputDefinition/Listing/Dao.php @@ -13,9 +13,9 @@ * @license http://www.pimcore.org/license GPLv3 and PCL */ -namespace Web2PrintToolsBundle\FavoriteOutputDefinition\Listing; +namespace Pimcore\Bundle\Web2PrintToolsBundle\FavoriteOutputDefinition\Listing; -use Web2PrintToolsBundle\FavoriteOutputDefinition; +use Pimcore\Bundle\Web2PrintToolsBundle\FavoriteOutputDefinition; /** * @property FavoriteOutputDefinition\Listing $model diff --git a/src/Migrations/PimcoreX/Version20210305134111.php b/src/Migrations/PimcoreX/Version20210305134111.php index 46b6599..ca2d290 100644 --- a/src/Migrations/PimcoreX/Version20210305134111.php +++ b/src/Migrations/PimcoreX/Version20210305134111.php @@ -13,7 +13,7 @@ * @license http://www.pimcore.org/license GPLv3 and PCL */ -namespace Web2PrintToolsBundle\Migrations\PimcoreX; +namespace Pimcore\Bundle\Web2PrintToolsBundle\Migrations\PimcoreX; use Doctrine\DBAL\Schema\Schema; use Pimcore\Migrations\BundleAwareMigration; diff --git a/src/Migrations/PimcoreX/Version20220914092411.php b/src/Migrations/PimcoreX/Version20220914092411.php index 87a6b3d..33a901b 100644 --- a/src/Migrations/PimcoreX/Version20220914092411.php +++ b/src/Migrations/PimcoreX/Version20220914092411.php @@ -13,12 +13,12 @@ * @license http://www.pimcore.org/license GPLv3 and PCL */ -namespace Web2PrintToolsBundle\Migrations\PimcoreX; +namespace Pimcore\Bundle\Web2PrintToolsBundle\Migrations\PimcoreX; use Doctrine\DBAL\Schema\Schema; +use Pimcore\Bundle\Web2PrintToolsBundle\FavoriteOutputDefinition\Dao; use Pimcore\Db; use Pimcore\Migrations\BundleAwareMigration; -use Web2PrintToolsBundle\FavoriteOutputDefinition\Dao; /** * Auto-generated Migration: Please modify to your needs! diff --git a/src/Migrations/PimcoreX/Version20230124103907.php b/src/Migrations/PimcoreX/Version20230124103907.php index 611d78d..c182ddd 100644 --- a/src/Migrations/PimcoreX/Version20230124103907.php +++ b/src/Migrations/PimcoreX/Version20230124103907.php @@ -15,11 +15,11 @@ * @license http://www.pimcore.org/license GPLv3 and PCL */ -namespace Web2PrintToolsBundle\Migrations\PimcoreX; +namespace Pimcore\Bundle\Web2PrintToolsBundle\Migrations\PimcoreX; use Doctrine\DBAL\Schema\Schema; use Doctrine\Migrations\AbstractMigration; -use Web2PrintToolsBundle\FavoriteOutputDefinition\Dao; +use Pimcore\Bundle\Web2PrintToolsBundle\FavoriteOutputDefinition\Dao; /** * Auto-generated Migration: Please modify to your needs! diff --git a/src/Migrations/Version20210305134111.php b/src/Migrations/Version20210305134111.php index a5f0efb..8983900 100644 --- a/src/Migrations/Version20210305134111.php +++ b/src/Migrations/Version20210305134111.php @@ -13,13 +13,13 @@ * @license http://www.pimcore.org/license GPLv3 and PCL */ -namespace Web2PrintToolsBundle\Migrations; +namespace Pimcore\Bundle\Web2PrintToolsBundle\Migrations; use Doctrine\DBAL\Schema\Schema; use Doctrine\Migrations\AbstractMigration; +use Pimcore\Bundle\Web2PrintToolsBundle\FavoriteOutputDefinition\Dao; use Pimcore\Config; use Pimcore\Model\Tool\SettingsStore; -use Web2PrintToolsBundle\FavoriteOutputDefinition\Dao; /** * Auto-generated Migration: Please modify to your needs! diff --git a/src/Model/Document/Editable/Outputchanneltable.php b/src/Model/Document/Editable/Outputchanneltable.php index e26d4a8..3636bfb 100644 --- a/src/Model/Document/Editable/Outputchanneltable.php +++ b/src/Model/Document/Editable/Outputchanneltable.php @@ -13,14 +13,14 @@ * @license http://www.pimcore.org/license GPLv3 and PCL */ -namespace Web2PrintToolsBundle\Model\Document\Editable; +namespace Pimcore\Bundle\Web2PrintToolsBundle\Model\Document\Editable; use OutputDataConfigToolkitBundle\OutputDefinition; +use Pimcore\Bundle\Web2PrintToolsBundle\Model\Document\Editable\Outputchanneltable\MetaEntry; use Pimcore\Model\Document; use Pimcore\Model\Document\Editable\EditableInterface; use Pimcore\Model\Document\Editable\EditmodeDataInterface; use Pimcore\Model\Element\ElementDescriptor; -use Web2PrintToolsBundle\Model\Document\Editable\Outputchanneltable\MetaEntry; class Outputchanneltable extends Document\Editable implements \Iterator, EditmodeDataInterface { diff --git a/src/Model/Document/Editable/Outputchanneltable/MetaEntry.php b/src/Model/Document/Editable/Outputchanneltable/MetaEntry.php index 9c437f1..5252043 100644 --- a/src/Model/Document/Editable/Outputchanneltable/MetaEntry.php +++ b/src/Model/Document/Editable/Outputchanneltable/MetaEntry.php @@ -13,7 +13,7 @@ * @license http://www.pimcore.org/license GPLv3 and PCL */ -namespace Web2PrintToolsBundle\Model\Document\Editable\Outputchanneltable; +namespace Pimcore\Bundle\Web2PrintToolsBundle\Model\Document\Editable\Outputchanneltable; class MetaEntry { diff --git a/src/Model/Document/Editable/Outputchanneltable/MetaEntry/Defaultentry.php b/src/Model/Document/Editable/Outputchanneltable/MetaEntry/Defaultentry.php index cd71323..275b985 100644 --- a/src/Model/Document/Editable/Outputchanneltable/MetaEntry/Defaultentry.php +++ b/src/Model/Document/Editable/Outputchanneltable/MetaEntry/Defaultentry.php @@ -13,9 +13,9 @@ * @license http://www.pimcore.org/license GPLv3 and PCL */ -namespace Web2PrintToolsBundle\Model\Document\Editable\Outputchanneltable\MetaEntry; +namespace Pimcore\Bundle\Web2PrintToolsBundle\Model\Document\Editable\Outputchanneltable\MetaEntry; -use Web2PrintToolsBundle\Model\Document\Editable\Outputchanneltable\MetaEntry; +use Pimcore\Bundle\Web2PrintToolsBundle\Model\Document\Editable\Outputchanneltable\MetaEntry; class Defaultentry extends MetaEntry { diff --git a/src/Model/Document/Editable/Outputchanneltable/MetaEntry/Table.php b/src/Model/Document/Editable/Outputchanneltable/MetaEntry/Table.php index 3d58e8f..1750344 100644 --- a/src/Model/Document/Editable/Outputchanneltable/MetaEntry/Table.php +++ b/src/Model/Document/Editable/Outputchanneltable/MetaEntry/Table.php @@ -13,9 +13,9 @@ * @license http://www.pimcore.org/license GPLv3 and PCL */ -namespace Web2PrintToolsBundle\Model\Document\Editable\Outputchanneltable\MetaEntry; +namespace Pimcore\Bundle\Web2PrintToolsBundle\Model\Document\Editable\Outputchanneltable\MetaEntry; -use Web2PrintToolsBundle\Model\Document\Editable\Outputchanneltable\MetaEntry; +use Pimcore\Bundle\Web2PrintToolsBundle\Model\Document\Editable\Outputchanneltable\MetaEntry; class Table extends MetaEntry { diff --git a/src/Resources/config/doctrine_migrations.yml b/src/Resources/config/doctrine_migrations.yml index 92b0edf..142ccf2 100644 --- a/src/Resources/config/doctrine_migrations.yml +++ b/src/Resources/config/doctrine_migrations.yml @@ -1,3 +1,3 @@ doctrine_migrations: migrations_paths: - 'Web2PrintToolsBundle\Migrations\PimcoreX': '@Web2PrintToolsBundle/Migrations/PimcoreX' + 'Pimcore\Bundle\Web2PrintToolsBundle\Migrations\PimcoreX': '@Web2PrintToolsBundle/Migrations/PimcoreX' diff --git a/src/Resources/config/pimcore/config.yml b/src/Resources/config/pimcore/config.yml index 8f11158..3a17808 100644 --- a/src/Resources/config/pimcore/config.yml +++ b/src/Resources/config/pimcore/config.yml @@ -2,4 +2,4 @@ pimcore: documents: editables: map: - outputchanneltable: Web2PrintToolsBundle\Model\Document\Editable\Outputchanneltable \ No newline at end of file + outputchanneltable: Pimcore\Bundle\Web2PrintToolsBundle\Model\Document\Editable\Outputchanneltable \ No newline at end of file diff --git a/src/Resources/config/services.yml b/src/Resources/config/services.yml index d2b0172..eeb54e5 100644 --- a/src/Resources/config/services.yml +++ b/src/Resources/config/services.yml @@ -5,16 +5,16 @@ services: autoconfigure: true public: false - Web2PrintToolsBundle\Twig\OutputChannelExtension: + Pimcore\Bundle\Web2PrintToolsBundle\Twig\OutputChannelExtension: tags: ['twig.extension'] - Web2PrintToolsBundle\Controller\: + Pimcore\Bundle\Web2PrintToolsBundle\Controller\: resource: '../../Controller' tags: ['controller.service_arguments'] - Web2PrintToolsBundle\Tools\Installer: + Pimcore\Bundle\Web2PrintToolsBundle\Tools\Installer: public: true arguments: # fetch the bundle via expression language diff --git a/src/Tools/Installer.php b/src/Tools/Installer.php index 9952f5e..f7197b2 100644 --- a/src/Tools/Installer.php +++ b/src/Tools/Installer.php @@ -13,12 +13,12 @@ * @license http://www.pimcore.org/license GPLv3 and PCL */ -namespace Web2PrintToolsBundle\Tools; +namespace Pimcore\Bundle\Web2PrintToolsBundle\Tools; +use Pimcore\Bundle\Web2PrintToolsBundle\FavoriteOutputDefinition\Dao; +use Pimcore\Bundle\Web2PrintToolsBundle\Migrations\PimcoreX\Version20230124103907; use Pimcore\Extension\Bundle\Installer\Exception\InstallationException; use Pimcore\Extension\Bundle\Installer\SettingsStoreAwareInstaller; -use Web2PrintToolsBundle\FavoriteOutputDefinition\Dao; -use Web2PrintToolsBundle\Migrations\PimcoreX\Version20230124103907; class Installer extends SettingsStoreAwareInstaller { diff --git a/src/Tools/Tool.php b/src/Tools/Tool.php index 6abcea1..0cf1344 100644 --- a/src/Tools/Tool.php +++ b/src/Tools/Tool.php @@ -13,7 +13,7 @@ * @license http://www.pimcore.org/license GPLv3 and PCL */ -namespace Web2PrintToolsBundle\Tools; +namespace Pimcore\Bundle\Web2PrintToolsBundle\Tools; use OutputDataConfigToolkitBundle\ConfigElement\Operator\Group; diff --git a/src/Twig/OutputChannelExtension.php b/src/Twig/OutputChannelExtension.php index 24be0ed..122c0d0 100644 --- a/src/Twig/OutputChannelExtension.php +++ b/src/Twig/OutputChannelExtension.php @@ -13,14 +13,14 @@ * @license http://www.pimcore.org/license GPLv3 and PCL */ -namespace Web2PrintToolsBundle\Twig; +namespace Pimcore\Bundle\Web2PrintToolsBundle\Twig; use OutputDataConfigToolkitBundle\ConfigElement\IConfigElement; use OutputDataConfigToolkitBundle\OutputDefinition; use OutputDataConfigToolkitBundle\Service; +use Pimcore\Bundle\Web2PrintToolsBundle\Tools\Tool; use Twig\Extension\AbstractExtension; use Twig\TwigFunction; -use Web2PrintToolsBundle\Tools\Tool; class OutputChannelExtension extends AbstractExtension { diff --git a/src/Web2PrintToolsBundle.php b/src/Web2PrintToolsBundle.php index f5e0910..6e0cfb0 100644 --- a/src/Web2PrintToolsBundle.php +++ b/src/Web2PrintToolsBundle.php @@ -13,16 +13,16 @@ * @license http://www.pimcore.org/license GPLv3 and PCL */ -namespace Web2PrintToolsBundle; +namespace Pimcore\Bundle\Web2PrintToolsBundle; +use Pimcore\Bundle\Web2PrintToolsBundle\DependencyInjection\Web2PrintToolsExtension; +use Pimcore\Bundle\Web2PrintToolsBundle\Tools\Installer; use Pimcore\Extension\Bundle\AbstractPimcoreBundle; use Pimcore\Extension\Bundle\Installer\InstallerInterface; use Pimcore\Extension\Bundle\PimcoreBundleAdminClassicInterface; use Pimcore\Extension\Bundle\Traits\BundleAdminClassicTrait; use Pimcore\Extension\Bundle\Traits\PackageVersionTrait; use Symfony\Component\DependencyInjection\Extension\ExtensionInterface; -use Web2PrintToolsBundle\DependencyInjection\Web2PrintToolsExtension; -use Web2PrintToolsBundle\Tools\Installer; class Web2PrintToolsBundle extends AbstractPimcoreBundle implements PimcoreBundleAdminClassicInterface {