Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,13 +19,13 @@
},
"autoload": {
"psr-4": {
"Web2PrintToolsBundle\\": "src/"
"Pimcore\\Bundle\\Web2PrintToolsBundle\\": "src/"
}
},
"extra": {
"pimcore": {
"bundles": [
"Web2PrintToolsBundle\\Web2PrintToolsBundle"
"Pimcore\\Bundle\\Web2PrintToolsBundle"
]
}
}
Expand Down
4 changes: 2 additions & 2 deletions src/Controller/AdminController.php
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/DependencyInjection/Web2PrintToolsExtension.php
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion src/FavoriteOutputDefinition.php
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
* @license http://www.pimcore.org/license GPLv3 and PCL
*/

namespace Web2PrintToolsBundle;
namespace Pimcore\Bundle\Web2PrintToolsBundle;

use Pimcore\Logger;

Expand Down
4 changes: 2 additions & 2 deletions src/FavoriteOutputDefinition/Dao.php
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/FavoriteOutputDefinition/Listing.php
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down
4 changes: 2 additions & 2 deletions src/FavoriteOutputDefinition/Listing/Dao.php
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/Migrations/PimcoreX/Version20210305134111.php
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions src/Migrations/PimcoreX/Version20220914092411.php
Original file line number Diff line number Diff line change
Expand Up @@ -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!
Expand Down
4 changes: 2 additions & 2 deletions src/Migrations/PimcoreX/Version20230124103907.php
Original file line number Diff line number Diff line change
Expand Up @@ -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!
Expand Down
4 changes: 2 additions & 2 deletions src/Migrations/Version20210305134111.php
Original file line number Diff line number Diff line change
Expand Up @@ -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!
Expand Down
4 changes: 2 additions & 2 deletions src/Model/Document/Editable/Outputchanneltable.php
Original file line number Diff line number Diff line change
Expand Up @@ -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
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
{
Expand Down
2 changes: 1 addition & 1 deletion src/Resources/config/doctrine_migrations.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
doctrine_migrations:
migrations_paths:
'Web2PrintToolsBundle\Migrations\PimcoreX': '@Web2PrintToolsBundle/Migrations/PimcoreX'
'Pimcore\Bundle\Web2PrintToolsBundle\Migrations\PimcoreX': '@Web2PrintToolsBundle/Migrations/PimcoreX'
2 changes: 1 addition & 1 deletion src/Resources/config/pimcore/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@ pimcore:
documents:
editables:
map:
outputchanneltable: Web2PrintToolsBundle\Model\Document\Editable\Outputchanneltable
outputchanneltable: Pimcore\Bundle\Web2PrintToolsBundle\Model\Document\Editable\Outputchanneltable
6 changes: 3 additions & 3 deletions src/Resources/config/services.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions src/Tools/Installer.php
Original file line number Diff line number Diff line change
Expand Up @@ -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
{
Expand Down
2 changes: 1 addition & 1 deletion src/Tools/Tool.php
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
4 changes: 2 additions & 2 deletions src/Twig/OutputChannelExtension.php
Original file line number Diff line number Diff line change
Expand Up @@ -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
{
Expand Down
6 changes: 3 additions & 3 deletions src/Web2PrintToolsBundle.php
Original file line number Diff line number Diff line change
Expand Up @@ -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
{
Expand Down