diff --git a/UPGRADE.md b/UPGRADE.md index d7b78c4ed6..f469a7a6da 100644 --- a/UPGRADE.md +++ b/UPGRADE.md @@ -14,14 +14,14 @@ * Changed the way how payment methods are created. Now you choose desired gateway first and configure payment method with it. All parameters that were previously configured in `yml` configuration file are now managed for each payment method in the Admin panel. -### ApiBundle +### AdminApiBundle -* Change the import path of your API routing from `src/Sylius/Bundle/ApiBundle/Resources/config/routing/main.yml` to `src/Sylius/Bundle/ApiBundle/Resources/config/routing.yml`. API became versioned, so you need to prefix them accordingly (e.g. `/api/customer` -> `/api/v1/customer`). +* Change the import path of your API routing from `src/Sylius/Bundle/ApiBundle/Resources/config/routing/main.yml` to `src/Sylius/Bundle/AdminApiBundle/Resources/config/routing.yml`. API became versioned, so you need to prefix them accordingly (e.g. `/api/customer` -> `/api/v1/customer`). * Routing definition for Shipping Categories has been removed and replaced with auto generated resource routing. Also, Shipping Categories are resolved by code instead of id. One can either change the way, how the routes are handled on theirs app (send `code` instead of `id`) or replace previous routing import with following definition: ```yaml - sylius_api_shipping_category_index: + sylius_admin_api_shipping_category_index: path: / methods: [GET] defaults: @@ -34,7 +34,7 @@ sorting: name: desc - sylius_api_shipping_category_create: + sylius_admin_api_shipping_category_create: path: / methods: [POST] defaults: @@ -42,7 +42,7 @@ _sylius: serialization_version: $version - sylius_api_shipping_category_update: + sylius_admin_api_shipping_category_update: path: /{id} methods: [PUT, PATCH] defaults: @@ -50,7 +50,7 @@ _sylius: serialization_version: $version - sylius_api_shipping_category_delete: + sylius_admin_api_shipping_category_delete: path: /{id} methods: [DELETE] defaults: @@ -59,7 +59,7 @@ serialization_version: $version csrf_protection: false - sylius_api_shipping_category_show: + sylius_admin_api_shipping_category_show: path: /{id} methods: [GET] defaults: @@ -389,7 +389,7 @@ From now on it won't compute every possible permutation of fallback locales from ### Configuration -* Move `sylius_shop` routing below `sylius_admin` and `sylius_api` in `app/config/routing.yml` and replace it with the following one: +* Move `sylius_shop` routing below `sylius_admin` and `sylius_admin_api` in `app/config/routing.yml` and replace it with the following one: ```yaml sylius_shop: diff --git a/app/AppKernel.php b/app/AppKernel.php index 283dbca389..2fbc57e7a6 100644 --- a/app/AppKernel.php +++ b/app/AppKernel.php @@ -26,8 +26,8 @@ class AppKernel extends Kernel new \Sylius\Bundle\AdminBundle\SyliusAdminBundle(), new \Sylius\Bundle\ShopBundle\SyliusShopBundle(), - new \FOS\OAuthServerBundle\FOSOAuthServerBundle(), // Required by SyliusApiBundle. - new \Sylius\Bundle\ApiBundle\SyliusApiBundle(), + new \FOS\OAuthServerBundle\FOSOAuthServerBundle(), // Required by SyliusAdminApiBundle. + new \Sylius\Bundle\AdminApiBundle\SyliusAdminApiBundle(), ]; return array_merge(parent::registerBundles(), $bundles); diff --git a/app/config/config.yml b/app/config/config.yml index c226f34e63..0fd70d0527 100644 --- a/app/config/config.yml +++ b/app/config/config.yml @@ -5,7 +5,7 @@ imports: - { resource: "@SyliusCoreBundle/Resources/config/app/config.yml" } - { resource: "@SyliusAdminBundle/Resources/config/app/config.yml" } - { resource: "@SyliusShopBundle/Resources/config/app/config.yml" } - - { resource: "@SyliusApiBundle/Resources/config/app/config.yml" } + - { resource: "@SyliusAdminApiBundle/Resources/config/app/config.yml" } - { resource: "parameters.yml" } - { resource: "security.yml" } diff --git a/app/config/routing.yml b/app/config/routing.yml index 3e18f43e76..2c416d873b 100644 --- a/app/config/routing.yml +++ b/app/config/routing.yml @@ -5,8 +5,8 @@ sylius_admin: resource: "@SyliusAdminBundle/Resources/config/routing.yml" prefix: /admin -sylius_api: - resource: "@SyliusApiBundle/Resources/config/routing.yml" +sylius_admin_api: + resource: "@SyliusAdminApiBundle/Resources/config/routing.yml" prefix: /api sylius_shop: diff --git a/app/migrations/Version20170313125424.php b/app/migrations/Version20170313125424.php new file mode 100644 index 0000000000..bb5543eb39 --- /dev/null +++ b/app/migrations/Version20170313125424.php @@ -0,0 +1,58 @@ +abortIf($this->connection->getDatabasePlatform()->getName() !== 'mysql', 'Migration can only be executed safely on \'mysql\'.'); + + $this->addSql('ALTER TABLE sylius_api_access_token RENAME sylius_admin_api_access_token'); + $this->addSql('ALTER TABLE sylius_api_auth_code RENAME sylius_admin_api_auth_code'); + $this->addSql('ALTER TABLE sylius_api_client RENAME sylius_admin_api_client'); + $this->addSql('ALTER TABLE sylius_api_refresh_token RENAME sylius_admin_api_refresh_token'); + $this->addSql('ALTER TABLE sylius_admin_api_access_token RENAME INDEX uniq_7d83aa7f5f37a13b TO UNIQ_2AA4915D5F37A13B'); + $this->addSql('ALTER TABLE sylius_admin_api_access_token RENAME INDEX idx_7d83aa7f19eb6921 TO IDX_2AA4915D19EB6921'); + $this->addSql('ALTER TABLE sylius_admin_api_access_token RENAME INDEX idx_7d83aa7fa76ed395 TO IDX_2AA4915DA76ED395'); + $this->addSql('ALTER TABLE sylius_admin_api_auth_code RENAME INDEX uniq_c84041795f37a13b TO UNIQ_E366D8485F37A13B'); + $this->addSql('ALTER TABLE sylius_admin_api_auth_code RENAME INDEX idx_c840417919eb6921 TO IDX_E366D84819EB6921'); + $this->addSql('ALTER TABLE sylius_admin_api_auth_code RENAME INDEX idx_c8404179a76ed395 TO IDX_E366D848A76ED395'); + $this->addSql('ALTER TABLE sylius_admin_api_refresh_token RENAME INDEX uniq_445785255f37a13b TO UNIQ_9160E3FA5F37A13B'); + $this->addSql('ALTER TABLE sylius_admin_api_refresh_token RENAME INDEX idx_4457852519eb6921 TO IDX_9160E3FA19EB6921'); + $this->addSql('ALTER TABLE sylius_admin_api_refresh_token RENAME INDEX idx_44578525a76ed395 TO IDX_9160E3FAA76ED395'); + } + + /** + * @param Schema $schema + */ + public function down(Schema $schema) + { + // this down() migration is auto-generated, please modify it to your needs + $this->abortIf($this->connection->getDatabasePlatform()->getName() !== 'mysql', 'Migration can only be executed safely on \'mysql\'.'); + + $this->addSql('ALTER TABLE sylius_admin_api_access_token RENAME INDEX uniq_2aa4915d5f37a13b TO UNIQ_7D83AA7F5F37A13B'); + $this->addSql('ALTER TABLE sylius_admin_api_access_token RENAME INDEX idx_2aa4915d19eb6921 TO IDX_7D83AA7F19EB6921'); + $this->addSql('ALTER TABLE sylius_admin_api_access_token RENAME INDEX idx_2aa4915da76ed395 TO IDX_7D83AA7FA76ED395'); + $this->addSql('ALTER TABLE sylius_admin_api_auth_code RENAME INDEX uniq_e366d8485f37a13b TO UNIQ_C84041795F37A13B'); + $this->addSql('ALTER TABLE sylius_admin_api_auth_code RENAME INDEX idx_e366d84819eb6921 TO IDX_C840417919EB6921'); + $this->addSql('ALTER TABLE sylius_admin_api_auth_code RENAME INDEX idx_e366d848a76ed395 TO IDX_C8404179A76ED395'); + $this->addSql('ALTER TABLE sylius_admin_api_refresh_token RENAME INDEX uniq_9160e3fa5f37a13b TO UNIQ_445785255F37A13B'); + $this->addSql('ALTER TABLE sylius_admin_api_refresh_token RENAME INDEX idx_9160e3fa19eb6921 TO IDX_4457852519EB6921'); + $this->addSql('ALTER TABLE sylius_admin_api_refresh_token RENAME INDEX idx_9160e3faa76ed395 TO IDX_44578525A76ED395'); + $this->addSql('ALTER TABLE sylius_admin_api_access_token RENAME sylius_api_access_token'); + $this->addSql('ALTER TABLE sylius_admin_api_auth_code RENAME sylius_api_auth_code'); + $this->addSql('ALTER TABLE sylius_admin_api_client RENAME sylius_api_client'); + $this->addSql('ALTER TABLE sylius_admin_api_refresh_token RENAME sylius_api_refresh_token'); + } +} diff --git a/docs/api/checkouts.rst b/docs/api/checkouts.rst index bd770a9e7e..fe149a8bc5 100644 --- a/docs/api/checkouts.rst +++ b/docs/api/checkouts.rst @@ -393,7 +393,7 @@ The response contains proposed shipments and for each of them, it has a list of Because of the custom calculation logic, the regular rules of overriding do not apply for this endpoint. In order to have a different response, you have to provide a custom controller and build the message on your own. - Exemplary implementation can be found `here `__ + Exemplary implementation can be found `here `__ Next step is updating the order with the types of shipping methods that have been selected. A PUT request has to be send for each available shipment. @@ -618,7 +618,7 @@ Definition .. warning:: - Similar to the shipping step, this one has its own controller, which has to be replaced if you want to make some changes. Exemplary implementation can be found `here `__ + Similar to the shipping step, this one has its own controller, which has to be replaced if you want to make some changes. Exemplary implementation can be found `here `__ Example ^^^^^^^ diff --git a/docs/api/sorting_and_filtration.rst b/docs/api/sorting_and_filtration.rst index dbf8f94009..a2257b9381 100644 --- a/docs/api/sorting_and_filtration.rst +++ b/docs/api/sorting_and_filtration.rst @@ -7,7 +7,7 @@ do it with sample resources. .. note:: To find out by which fields the api resources can be sorted and how they can be filtered you should check the grid configuration of these - `here `_ + `here `_ How to sort resources? ---------------------- diff --git a/docs/cookbook/disabling-shop-admin-api.rst b/docs/cookbook/disabling-shop-admin-api.rst index de7f92d573..0073cf00d7 100644 --- a/docs/cookbook/disabling-shop-admin-api.rst +++ b/docs/cookbook/disabling-shop-admin-api.rst @@ -22,7 +22,7 @@ How to disable Sylius shop? // new \Sylius\Bundle\ShopBundle\SyliusShopBundle(), // - remove or leave this line commented new \FOS\OAuthServerBundle\FOSOAuthServerBundle(), - new \Sylius\Bundle\ApiBundle\SyliusApiBundle(), + new \Sylius\Bundle\AdminApiBundle\SyliusAdminApiBundle(), new \AppBundle\AppBundle(), ]; @@ -100,7 +100,7 @@ How to disable Sylius Admin? new \Sylius\Bundle\ShopBundle\SyliusShopBundle(), new \FOS\OAuthServerBundle\FOSOAuthServerBundle(), - new \Sylius\Bundle\ApiBundle\SyliusApiBundle(), + new \Sylius\Bundle\AdminApiBundle\SyliusAdminApiBundle(), new \AppBundle\AppBundle(), ]; @@ -155,7 +155,7 @@ The part that has to be removed from this file is shown below: How to disable Sylius API? -------------------------- -**1.** Remove SyliusApiBundle from ``app/AppKernel``. +**1.** Remove SyliusAdminApiBundle from ``app/AppKernel``. .. code-block:: php @@ -168,7 +168,7 @@ How to disable Sylius API? new \Sylius\Bundle\ShopBundle\SyliusShopBundle(), new \FOS\OAuthServerBundle\FOSOAuthServerBundle(), - // new \Sylius\Bundle\ApiBundle\SyliusApiBundle(), // - remove or leave this line commented + // new \Sylius\Bundle\AdminApiBundle\SyliusAdminApiBundle(), // - remove or leave this line commented new \AppBundle\AppBundle(), ]; @@ -176,21 +176,21 @@ How to disable Sylius API? return array_merge(parent::registerBundles(), $bundles); } -**2.** Remove SyliusApiBundle's config import from ``app/config/config.yml``. +**2.** Remove SyliusAdminApiBundle's config import from ``app/config/config.yml``. Here you've got the line that should disappear from imports: .. code-block:: yaml imports: - # - { resource: "@SyliusApiBundle/Resources/config/app/config.yml" } # remove or leave this line commented + # - { resource: "@SyliusAdminApiBundle/Resources/config/app/config.yml" } # remove or leave this line commented -**3.** Remove SyliusApiBundle routing configuration from ``app/config/routing.yml``. +**3.** Remove SyliusAdminApiBundle routing configuration from ``app/config/routing.yml``. .. code-block:: yaml # sylius_shop: - # resource: "@SyliusApiBundle/Resources/config/routing.yml" # remove or leave these lines commented + # resource: "@SyliusAdminApiBundle/Resources/config/routing.yml" # remove or leave these lines commented **4.** Remove security configuration from ``app/config/security.yml``. diff --git a/phpspec.yml.dist b/phpspec.yml.dist index de3f863413..7a2f6274e2 100644 --- a/phpspec.yml.dist +++ b/phpspec.yml.dist @@ -23,7 +23,7 @@ suites: AddressingBundle: { namespace: Sylius\Bundle\AddressingBundle, psr4_prefix: Sylius\Bundle\AddressingBundle, spec_path: src/Sylius/Bundle/AddressingBundle, src_path: src/Sylius/Bundle/AddressingBundle } AdminBundle: { namespace: Sylius\Bundle\AdminBundle, psr4_prefix: Sylius\Bundle\AdminBundle, spec_path: src/Sylius/Bundle/AdminBundle, src_path: src/Sylius/Bundle/AdminBundle } - ApiBundle: { namespace: Sylius\Bundle\ApiBundle, psr4_prefix: Sylius\Bundle\ApiBundle, spec_path: src/Sylius/Bundle/ApiBundle, src_path: src/Sylius/Bundle/ApiBundle } + AdminApiBundle: { namespace: Sylius\Bundle\AdminApiBundle, psr4_prefix: Sylius\Bundle\AdminApiBundle, spec_path: src/Sylius/Bundle/AdminApiBundle, src_path: src/Sylius/Bundle/AdminApiBundle } AttributeBundle: { namespace: Sylius\Bundle\AttributeBundle, psr4_prefix: Sylius\Bundle\AttributeBundle, spec_path: src/Sylius/Bundle/AttributeBundle, src_path: src/Sylius/Bundle/AttributeBundle } ChannelBundle: { namespace: Sylius\Bundle\ChannelBundle, psr4_prefix: Sylius\Bundle\ChannelBundle, spec_path: src/Sylius/Bundle/ChannelBundle, src_path: src/Sylius/Bundle/ChannelBundle } CoreBundle: { namespace: Sylius\Bundle\CoreBundle, psr4_prefix: Sylius\Bundle\CoreBundle, spec_path: src/Sylius/Bundle/CoreBundle, src_path: src/Sylius/Bundle/CoreBundle } diff --git a/src/Sylius/Bundle/AddressingBundle/Resources/config/serializer/Model.Country.yml b/src/Sylius/Bundle/AddressingBundle/Resources/config/serializer/Model.Country.yml index b7594469b2..6c5ba4b13e 100644 --- a/src/Sylius/Bundle/AddressingBundle/Resources/config/serializer/Model.Country.yml +++ b/src/Sylius/Bundle/AddressingBundle/Resources/config/serializer/Model.Country.yml @@ -22,7 +22,7 @@ Sylius\Component\Addressing\Model\Country: relations: - rel: self href: - route: sylius_api_country_show + route: sylius_admin_api_country_show parameters: code: expr(object.getCode()) version: 1 diff --git a/src/Sylius/Bundle/AddressingBundle/Resources/config/serializer/Model.Province.yml b/src/Sylius/Bundle/AddressingBundle/Resources/config/serializer/Model.Province.yml index db10079d0e..22b84d9de0 100644 --- a/src/Sylius/Bundle/AddressingBundle/Resources/config/serializer/Model.Province.yml +++ b/src/Sylius/Bundle/AddressingBundle/Resources/config/serializer/Model.Province.yml @@ -30,7 +30,7 @@ Sylius\Component\Addressing\Model\Province: relations: - rel: self href: - route: sylius_api_province_show + route: sylius_admin_api_province_show parameters: countryCode: expr(object.getCountry().getCode()) code: expr(object.getCode()) @@ -39,7 +39,7 @@ Sylius\Component\Addressing\Model\Province: groups: [Default, Detailed] - rel: country href: - route: sylius_api_country_show + route: sylius_admin_api_country_show parameters: code: expr(object.getCountry().getCode()) version: 1 diff --git a/src/Sylius/Bundle/AddressingBundle/Resources/config/serializer/Model.Zone.yml b/src/Sylius/Bundle/AddressingBundle/Resources/config/serializer/Model.Zone.yml index ea31662258..a011cf15b7 100644 --- a/src/Sylius/Bundle/AddressingBundle/Resources/config/serializer/Model.Zone.yml +++ b/src/Sylius/Bundle/AddressingBundle/Resources/config/serializer/Model.Zone.yml @@ -38,7 +38,7 @@ Sylius\Component\Addressing\Model\Zone: relations: - rel: self href: - route: sylius_api_zone_show + route: sylius_admin_api_zone_show parameters: code: expr(object.getCode()) version: 1 diff --git a/src/Sylius/Bundle/ApiBundle/.gitignore b/src/Sylius/Bundle/AdminApiBundle/.gitignore similarity index 100% rename from src/Sylius/Bundle/ApiBundle/.gitignore rename to src/Sylius/Bundle/AdminApiBundle/.gitignore diff --git a/src/Sylius/Bundle/ApiBundle/Command/CreateClientCommand.php b/src/Sylius/Bundle/AdminApiBundle/Command/CreateClientCommand.php similarity index 96% rename from src/Sylius/Bundle/ApiBundle/Command/CreateClientCommand.php rename to src/Sylius/Bundle/AdminApiBundle/Command/CreateClientCommand.php index f9130e9f4d..5a0a2fa8de 100644 --- a/src/Sylius/Bundle/ApiBundle/Command/CreateClientCommand.php +++ b/src/Sylius/Bundle/AdminApiBundle/Command/CreateClientCommand.php @@ -9,10 +9,10 @@ * file that was distributed with this source code. */ -namespace Sylius\Bundle\ApiBundle\Command; +namespace Sylius\Bundle\AdminApiBundle\Command; use FOS\OAuthServerBundle\Model\ClientManagerInterface; -use Sylius\Bundle\ApiBundle\Model\Client; +use Sylius\Bundle\AdminApiBundle\Model\Client; use Symfony\Bundle\FrameworkBundle\Command\ContainerAwareCommand; use Symfony\Component\Console\Input\InputInterface; use Symfony\Component\Console\Input\InputOption; diff --git a/src/Sylius/Bundle/ApiBundle/Controller/ProductTaxonPositionController.php b/src/Sylius/Bundle/AdminApiBundle/Controller/ProductTaxonPositionController.php similarity index 98% rename from src/Sylius/Bundle/ApiBundle/Controller/ProductTaxonPositionController.php rename to src/Sylius/Bundle/AdminApiBundle/Controller/ProductTaxonPositionController.php index 4c1c53ed76..90f8aa3b2b 100644 --- a/src/Sylius/Bundle/ApiBundle/Controller/ProductTaxonPositionController.php +++ b/src/Sylius/Bundle/AdminApiBundle/Controller/ProductTaxonPositionController.php @@ -9,7 +9,7 @@ * file that was distributed with this source code. */ -namespace Sylius\Bundle\ApiBundle\Controller; +namespace Sylius\Bundle\AdminApiBundle\Controller; use Doctrine\ORM\EntityManagerInterface; use Sylius\Component\Core\Model\ProductTaxonInterface; diff --git a/src/Sylius/Bundle/ApiBundle/Controller/ShowAvailablePaymentMethodsController.php b/src/Sylius/Bundle/AdminApiBundle/Controller/ShowAvailablePaymentMethodsController.php similarity index 98% rename from src/Sylius/Bundle/ApiBundle/Controller/ShowAvailablePaymentMethodsController.php rename to src/Sylius/Bundle/AdminApiBundle/Controller/ShowAvailablePaymentMethodsController.php index a3493e5d75..9af6cce45e 100644 --- a/src/Sylius/Bundle/ApiBundle/Controller/ShowAvailablePaymentMethodsController.php +++ b/src/Sylius/Bundle/AdminApiBundle/Controller/ShowAvailablePaymentMethodsController.php @@ -9,7 +9,7 @@ * file that was distributed with this source code. */ -namespace Sylius\Bundle\ApiBundle\Controller; +namespace Sylius\Bundle\AdminApiBundle\Controller; use FOS\RestBundle\View\View; use FOS\RestBundle\View\ViewHandlerInterface; diff --git a/src/Sylius/Bundle/ApiBundle/Controller/ShowAvailableShippingMethodsController.php b/src/Sylius/Bundle/AdminApiBundle/Controller/ShowAvailableShippingMethodsController.php similarity index 98% rename from src/Sylius/Bundle/ApiBundle/Controller/ShowAvailableShippingMethodsController.php rename to src/Sylius/Bundle/AdminApiBundle/Controller/ShowAvailableShippingMethodsController.php index 455a39d759..db51674cbe 100644 --- a/src/Sylius/Bundle/ApiBundle/Controller/ShowAvailableShippingMethodsController.php +++ b/src/Sylius/Bundle/AdminApiBundle/Controller/ShowAvailableShippingMethodsController.php @@ -9,7 +9,7 @@ * file that was distributed with this source code. */ -namespace Sylius\Bundle\ApiBundle\Controller; +namespace Sylius\Bundle\AdminApiBundle\Controller; use FOS\RestBundle\View\View; use FOS\RestBundle\View\ViewHandlerInterface; diff --git a/src/Sylius/Bundle/ApiBundle/DependencyInjection/Configuration.php b/src/Sylius/Bundle/AdminApiBundle/DependencyInjection/Configuration.php similarity index 91% rename from src/Sylius/Bundle/ApiBundle/DependencyInjection/Configuration.php rename to src/Sylius/Bundle/AdminApiBundle/DependencyInjection/Configuration.php index a9c798d655..b667f355dd 100644 --- a/src/Sylius/Bundle/ApiBundle/DependencyInjection/Configuration.php +++ b/src/Sylius/Bundle/AdminApiBundle/DependencyInjection/Configuration.php @@ -9,18 +9,18 @@ * file that was distributed with this source code. */ -namespace Sylius\Bundle\ApiBundle\DependencyInjection; +namespace Sylius\Bundle\AdminApiBundle\DependencyInjection; -use Sylius\Bundle\ApiBundle\Form\Type\ClientType; -use Sylius\Bundle\ApiBundle\Model\AccessToken; -use Sylius\Bundle\ApiBundle\Model\AccessTokenInterface; -use Sylius\Bundle\ApiBundle\Model\AuthCode; -use Sylius\Bundle\ApiBundle\Model\AuthCodeInterface; -use Sylius\Bundle\ApiBundle\Model\Client; -use Sylius\Bundle\ApiBundle\Model\ClientInterface; -use Sylius\Bundle\ApiBundle\Model\RefreshToken; -use Sylius\Bundle\ApiBundle\Model\RefreshTokenInterface; -use Sylius\Bundle\ApiBundle\Model\UserInterface; +use Sylius\Bundle\AdminApiBundle\Form\Type\ClientType; +use Sylius\Bundle\AdminApiBundle\Model\AccessToken; +use Sylius\Bundle\AdminApiBundle\Model\AccessTokenInterface; +use Sylius\Bundle\AdminApiBundle\Model\AuthCode; +use Sylius\Bundle\AdminApiBundle\Model\AuthCodeInterface; +use Sylius\Bundle\AdminApiBundle\Model\Client; +use Sylius\Bundle\AdminApiBundle\Model\ClientInterface; +use Sylius\Bundle\AdminApiBundle\Model\RefreshToken; +use Sylius\Bundle\AdminApiBundle\Model\RefreshTokenInterface; +use Sylius\Bundle\AdminApiBundle\Model\UserInterface; use Sylius\Bundle\ResourceBundle\Controller\ResourceController; use Sylius\Bundle\ResourceBundle\SyliusResourceBundle; use Sylius\Component\Resource\Factory\Factory; @@ -39,7 +39,7 @@ final class Configuration implements ConfigurationInterface public function getConfigTreeBuilder() { $treeBuilder = new TreeBuilder(); - $rootNode = $treeBuilder->root('sylius_api'); + $rootNode = $treeBuilder->root('sylius_admin_api'); $rootNode ->children() diff --git a/src/Sylius/Bundle/ApiBundle/DependencyInjection/SyliusApiExtension.php b/src/Sylius/Bundle/AdminApiBundle/DependencyInjection/SyliusAdminApiExtension.php similarity index 91% rename from src/Sylius/Bundle/ApiBundle/DependencyInjection/SyliusApiExtension.php rename to src/Sylius/Bundle/AdminApiBundle/DependencyInjection/SyliusAdminApiExtension.php index 98736de66f..b207021891 100644 --- a/src/Sylius/Bundle/ApiBundle/DependencyInjection/SyliusApiExtension.php +++ b/src/Sylius/Bundle/AdminApiBundle/DependencyInjection/SyliusAdminApiExtension.php @@ -9,9 +9,9 @@ * file that was distributed with this source code. */ -namespace Sylius\Bundle\ApiBundle\DependencyInjection; +namespace Sylius\Bundle\AdminApiBundle\DependencyInjection; -use Sylius\Bundle\ApiBundle\Controller\TokenController; +use Sylius\Bundle\AdminApiBundle\Controller\TokenController; use Sylius\Bundle\ResourceBundle\DependencyInjection\Extension\AbstractResourceExtension; use Symfony\Component\Config\FileLocator; use Symfony\Component\DependencyInjection\ContainerBuilder; @@ -24,7 +24,7 @@ use Symfony\Component\DependencyInjection\Reference; /** * @author Paweł Jędrzejewski */ -final class SyliusApiExtension extends AbstractResourceExtension implements PrependExtensionInterface +final class SyliusAdminApiExtension extends AbstractResourceExtension implements PrependExtensionInterface { /** * {@inheritdoc} diff --git a/src/Sylius/Bundle/ApiBundle/EventListener/CartChangeListener.php b/src/Sylius/Bundle/AdminApiBundle/EventListener/CartChangeListener.php similarity index 97% rename from src/Sylius/Bundle/ApiBundle/EventListener/CartChangeListener.php rename to src/Sylius/Bundle/AdminApiBundle/EventListener/CartChangeListener.php index d4e037620b..11b91458f5 100644 --- a/src/Sylius/Bundle/ApiBundle/EventListener/CartChangeListener.php +++ b/src/Sylius/Bundle/AdminApiBundle/EventListener/CartChangeListener.php @@ -9,7 +9,7 @@ * file that was distributed with this source code. */ -namespace Sylius\Bundle\ApiBundle\EventListener; +namespace Sylius\Bundle\AdminApiBundle\EventListener; use Doctrine\Common\Persistence\ObjectManager; use Sylius\Component\Core\Model\OrderItemInterface; diff --git a/src/Sylius/Bundle/ApiBundle/Fixture/ApiAccessTokenFixture.php b/src/Sylius/Bundle/AdminApiBundle/Fixture/ApiAccessTokenFixture.php similarity index 95% rename from src/Sylius/Bundle/ApiBundle/Fixture/ApiAccessTokenFixture.php rename to src/Sylius/Bundle/AdminApiBundle/Fixture/ApiAccessTokenFixture.php index c1c5da88c6..6c83dc435a 100644 --- a/src/Sylius/Bundle/ApiBundle/Fixture/ApiAccessTokenFixture.php +++ b/src/Sylius/Bundle/AdminApiBundle/Fixture/ApiAccessTokenFixture.php @@ -9,7 +9,7 @@ * file that was distributed with this source code. */ -namespace Sylius\Bundle\ApiBundle\Fixture; +namespace Sylius\Bundle\AdminApiBundle\Fixture; use Sylius\Bundle\CoreBundle\Fixture\AbstractResourceFixture; use Symfony\Component\Config\Definition\Builder\ArrayNodeDefinition; diff --git a/src/Sylius/Bundle/ApiBundle/Fixture/ApiClientFixture.php b/src/Sylius/Bundle/AdminApiBundle/Fixture/ApiClientFixture.php similarity index 95% rename from src/Sylius/Bundle/ApiBundle/Fixture/ApiClientFixture.php rename to src/Sylius/Bundle/AdminApiBundle/Fixture/ApiClientFixture.php index 30e8a69f69..50da5d7fe5 100644 --- a/src/Sylius/Bundle/ApiBundle/Fixture/ApiClientFixture.php +++ b/src/Sylius/Bundle/AdminApiBundle/Fixture/ApiClientFixture.php @@ -9,7 +9,7 @@ * file that was distributed with this source code. */ -namespace Sylius\Bundle\ApiBundle\Fixture; +namespace Sylius\Bundle\AdminApiBundle\Fixture; use Sylius\Bundle\CoreBundle\Fixture\AbstractResourceFixture; use Symfony\Component\Config\Definition\Builder\ArrayNodeDefinition; diff --git a/src/Sylius/Bundle/ApiBundle/Fixture/Factory/ApiAccessTokenExampleFactory.php b/src/Sylius/Bundle/AdminApiBundle/Fixture/Factory/ApiAccessTokenExampleFactory.php similarity index 93% rename from src/Sylius/Bundle/ApiBundle/Fixture/Factory/ApiAccessTokenExampleFactory.php rename to src/Sylius/Bundle/AdminApiBundle/Fixture/Factory/ApiAccessTokenExampleFactory.php index 2444679cef..7f9429b6a3 100644 --- a/src/Sylius/Bundle/ApiBundle/Fixture/Factory/ApiAccessTokenExampleFactory.php +++ b/src/Sylius/Bundle/AdminApiBundle/Fixture/Factory/ApiAccessTokenExampleFactory.php @@ -9,12 +9,12 @@ * file that was distributed with this source code. */ -namespace Sylius\Bundle\ApiBundle\Fixture\Factory; +namespace Sylius\Bundle\AdminApiBundle\Fixture\Factory; use FOS\OAuthServerBundle\Model\ClientManagerInterface; -use Sylius\Bundle\ApiBundle\Model\AccessTokenInterface; -use Sylius\Bundle\ApiBundle\Model\ClientInterface; -use Sylius\Bundle\ApiBundle\Model\UserInterface; +use Sylius\Bundle\AdminApiBundle\Model\AccessTokenInterface; +use Sylius\Bundle\AdminApiBundle\Model\ClientInterface; +use Sylius\Bundle\AdminApiBundle\Model\UserInterface; use Sylius\Bundle\CoreBundle\Fixture\Factory\AbstractExampleFactory; use Sylius\Bundle\CoreBundle\Fixture\OptionsResolver\LazyOption; use Sylius\Component\Resource\Factory\FactoryInterface; diff --git a/src/Sylius/Bundle/ApiBundle/Fixture/Factory/ApiClientExampleFactory.php b/src/Sylius/Bundle/AdminApiBundle/Fixture/Factory/ApiClientExampleFactory.php similarity index 95% rename from src/Sylius/Bundle/ApiBundle/Fixture/Factory/ApiClientExampleFactory.php rename to src/Sylius/Bundle/AdminApiBundle/Fixture/Factory/ApiClientExampleFactory.php index 9f360e0e38..d412987c74 100644 --- a/src/Sylius/Bundle/ApiBundle/Fixture/Factory/ApiClientExampleFactory.php +++ b/src/Sylius/Bundle/AdminApiBundle/Fixture/Factory/ApiClientExampleFactory.php @@ -9,10 +9,10 @@ * file that was distributed with this source code. */ -namespace Sylius\Bundle\ApiBundle\Fixture\Factory; +namespace Sylius\Bundle\AdminApiBundle\Fixture\Factory; use FOS\OAuthServerBundle\Model\ClientManagerInterface; -use Sylius\Bundle\ApiBundle\Model\ClientInterface; +use Sylius\Bundle\AdminApiBundle\Model\ClientInterface; use Sylius\Bundle\CoreBundle\Fixture\Factory\AbstractExampleFactory; use Symfony\Component\OptionsResolver\Options; use Symfony\Component\OptionsResolver\OptionsResolver; diff --git a/src/Sylius/Bundle/ApiBundle/Form/EventSubscriber/AddUserFormSubscriber.php b/src/Sylius/Bundle/AdminApiBundle/Form/EventSubscriber/AddUserFormSubscriber.php similarity index 96% rename from src/Sylius/Bundle/ApiBundle/Form/EventSubscriber/AddUserFormSubscriber.php rename to src/Sylius/Bundle/AdminApiBundle/Form/EventSubscriber/AddUserFormSubscriber.php index 3f1b8c8868..2628702495 100644 --- a/src/Sylius/Bundle/ApiBundle/Form/EventSubscriber/AddUserFormSubscriber.php +++ b/src/Sylius/Bundle/AdminApiBundle/Form/EventSubscriber/AddUserFormSubscriber.php @@ -9,7 +9,7 @@ * file that was distributed with this source code. */ -namespace Sylius\Bundle\ApiBundle\Form\EventSubscriber; +namespace Sylius\Bundle\AdminApiBundle\Form\EventSubscriber; use Sylius\Component\User\Model\UserAwareInterface; use Symfony\Component\EventDispatcher\EventSubscriberInterface; @@ -27,7 +27,7 @@ final class AddUserFormSubscriber implements EventSubscriberInterface * @var string */ private $entryType; - + /** * @param string $entryType */ @@ -35,7 +35,7 @@ final class AddUserFormSubscriber implements EventSubscriberInterface { $this->entryType = $entryType; } - + /** * @return array */ @@ -46,7 +46,7 @@ final class AddUserFormSubscriber implements EventSubscriberInterface FormEvents::PRE_SUBMIT => 'preSubmit', ]; } - + /** * @param FormEvent $event */ @@ -55,7 +55,7 @@ final class AddUserFormSubscriber implements EventSubscriberInterface $form = $event->getForm(); $form->add('user', $this->entryType, ['constraints' => [new Valid()]]); } - + /** * @param FormEvent $event */ @@ -74,7 +74,7 @@ final class AddUserFormSubscriber implements EventSubscriberInterface $this->removeUserField($event); } } - + /** * @param array $data * @@ -89,7 +89,7 @@ final class AddUserFormSubscriber implements EventSubscriberInterface } return true; } - + /** * @param FormEvent $event */ diff --git a/src/Sylius/Bundle/ApiBundle/Form/Type/AddressType.php b/src/Sylius/Bundle/AdminApiBundle/Form/Type/AddressType.php similarity index 94% rename from src/Sylius/Bundle/ApiBundle/Form/Type/AddressType.php rename to src/Sylius/Bundle/AdminApiBundle/Form/Type/AddressType.php index b50544c410..49887c9bd1 100644 --- a/src/Sylius/Bundle/ApiBundle/Form/Type/AddressType.php +++ b/src/Sylius/Bundle/AdminApiBundle/Form/Type/AddressType.php @@ -9,7 +9,7 @@ * file that was distributed with this source code. */ -namespace Sylius\Bundle\ApiBundle\Form\Type; +namespace Sylius\Bundle\AdminApiBundle\Form\Type; use Sylius\Bundle\AddressingBundle\Form\Type\AddressType as SyliusAddressType; use Symfony\Component\Form\AbstractType; @@ -59,6 +59,6 @@ final class AddressType extends AbstractType */ public function getBlockPrefix() { - return 'sylius_api_checkout_address'; + return 'sylius_admin_api_checkout_address'; } } diff --git a/src/Sylius/Bundle/ApiBundle/Form/Type/ClientType.php b/src/Sylius/Bundle/AdminApiBundle/Form/Type/ClientType.php similarity index 90% rename from src/Sylius/Bundle/ApiBundle/Form/Type/ClientType.php rename to src/Sylius/Bundle/AdminApiBundle/Form/Type/ClientType.php index f7ba0f07e5..bc2ebe30e7 100644 --- a/src/Sylius/Bundle/ApiBundle/Form/Type/ClientType.php +++ b/src/Sylius/Bundle/AdminApiBundle/Form/Type/ClientType.php @@ -9,7 +9,7 @@ * file that was distributed with this source code. */ -namespace Sylius\Bundle\ApiBundle\Form\Type; +namespace Sylius\Bundle\AdminApiBundle\Form\Type; use Sylius\Bundle\ResourceBundle\Form\Type\AbstractResourceType; use Symfony\Component\Form\Extension\Core\Type\TextType; @@ -37,6 +37,6 @@ final class ClientType extends AbstractResourceType */ public function getBlockPrefix() { - return 'sylius_api_client'; + return 'sylius_admin_api_client'; } } diff --git a/src/Sylius/Bundle/ApiBundle/Form/Type/CustomerProfileType.php b/src/Sylius/Bundle/AdminApiBundle/Form/Type/CustomerProfileType.php similarity index 90% rename from src/Sylius/Bundle/ApiBundle/Form/Type/CustomerProfileType.php rename to src/Sylius/Bundle/AdminApiBundle/Form/Type/CustomerProfileType.php index b6b0abacc0..f2becb0667 100644 --- a/src/Sylius/Bundle/ApiBundle/Form/Type/CustomerProfileType.php +++ b/src/Sylius/Bundle/AdminApiBundle/Form/Type/CustomerProfileType.php @@ -9,9 +9,9 @@ * file that was distributed with this source code. */ -namespace Sylius\Bundle\ApiBundle\Form\Type; +namespace Sylius\Bundle\AdminApiBundle\Form\Type; -use Sylius\Bundle\ApiBundle\Form\EventSubscriber\AddUserFormSubscriber; +use Sylius\Bundle\AdminApiBundle\Form\EventSubscriber\AddUserFormSubscriber; use Sylius\Bundle\CoreBundle\Form\Type\User\ShopUserType; use Sylius\Bundle\CustomerBundle\Form\Type\CustomerGroupChoiceType; use Sylius\Bundle\CustomerBundle\Form\Type\CustomerProfileType as BaseCustomerProfileType; diff --git a/src/Sylius/Bundle/ApiBundle/Form/Type/OrderItemType.php b/src/Sylius/Bundle/AdminApiBundle/Form/Type/OrderItemType.php similarity index 95% rename from src/Sylius/Bundle/ApiBundle/Form/Type/OrderItemType.php rename to src/Sylius/Bundle/AdminApiBundle/Form/Type/OrderItemType.php index d1db2e0c19..2348ae2b04 100644 --- a/src/Sylius/Bundle/ApiBundle/Form/Type/OrderItemType.php +++ b/src/Sylius/Bundle/AdminApiBundle/Form/Type/OrderItemType.php @@ -9,7 +9,7 @@ * file that was distributed with this source code. */ -namespace Sylius\Bundle\ApiBundle\Form\Type; +namespace Sylius\Bundle\AdminApiBundle\Form\Type; use Sylius\Bundle\OrderBundle\Form\Type\OrderItemType as BaseOrderItemType; use Sylius\Bundle\ResourceBundle\Form\DataTransformer\ResourceToIdentifierTransformer; @@ -81,6 +81,6 @@ final class OrderItemType extends AbstractType */ public function getBlockPrefix() { - return 'sylius_api_order_item'; + return 'sylius_admin_api_order_item'; } } diff --git a/src/Sylius/Bundle/ApiBundle/Form/Type/OrderPromotionCouponType.php b/src/Sylius/Bundle/AdminApiBundle/Form/Type/OrderPromotionCouponType.php similarity index 93% rename from src/Sylius/Bundle/ApiBundle/Form/Type/OrderPromotionCouponType.php rename to src/Sylius/Bundle/AdminApiBundle/Form/Type/OrderPromotionCouponType.php index c2ae3f642c..80ac5bd255 100644 --- a/src/Sylius/Bundle/ApiBundle/Form/Type/OrderPromotionCouponType.php +++ b/src/Sylius/Bundle/AdminApiBundle/Form/Type/OrderPromotionCouponType.php @@ -9,7 +9,7 @@ * file that was distributed with this source code. */ -namespace Sylius\Bundle\ApiBundle\Form\Type; +namespace Sylius\Bundle\AdminApiBundle\Form\Type; use Sylius\Bundle\ChannelBundle\Form\Type\ChannelChoiceType; use Sylius\Bundle\CustomerBundle\Form\Type\CustomerChoiceType; @@ -50,6 +50,6 @@ final class OrderPromotionCouponType extends AbstractResourceType */ public function getBlockPrefix() { - return 'sylius_api_order_promotion_coupon'; + return 'sylius_admin_api_order_promotion_coupon'; } } diff --git a/src/Sylius/Bundle/ApiBundle/Form/Type/OrderType.php b/src/Sylius/Bundle/AdminApiBundle/Form/Type/OrderType.php similarity index 96% rename from src/Sylius/Bundle/ApiBundle/Form/Type/OrderType.php rename to src/Sylius/Bundle/AdminApiBundle/Form/Type/OrderType.php index 4f8c554d84..ae93b13f45 100644 --- a/src/Sylius/Bundle/ApiBundle/Form/Type/OrderType.php +++ b/src/Sylius/Bundle/AdminApiBundle/Form/Type/OrderType.php @@ -9,7 +9,7 @@ * file that was distributed with this source code. */ -namespace Sylius\Bundle\ApiBundle\Form\Type; +namespace Sylius\Bundle\AdminApiBundle\Form\Type; use Sylius\Bundle\ChannelBundle\Form\Type\ChannelChoiceType; use Sylius\Bundle\CustomerBundle\Form\Type\CustomerChoiceType; @@ -89,6 +89,6 @@ final class OrderType extends AbstractResourceType */ public function getBlockPrefix() { - return 'sylius_api_order'; + return 'sylius_admin_api_order'; } } diff --git a/src/Sylius/Bundle/ApiBundle/Form/Type/ProductType.php b/src/Sylius/Bundle/AdminApiBundle/Form/Type/ProductType.php similarity index 95% rename from src/Sylius/Bundle/ApiBundle/Form/Type/ProductType.php rename to src/Sylius/Bundle/AdminApiBundle/Form/Type/ProductType.php index 78f74108b0..ce7fd7b806 100644 --- a/src/Sylius/Bundle/ApiBundle/Form/Type/ProductType.php +++ b/src/Sylius/Bundle/AdminApiBundle/Form/Type/ProductType.php @@ -9,7 +9,7 @@ * file that was distributed with this source code. */ -namespace Sylius\Bundle\ApiBundle\Form\Type; +namespace Sylius\Bundle\AdminApiBundle\Form\Type; use Sylius\Bundle\ProductBundle\Form\Type\ProductType as BaseProductType; use Symfony\Component\Form\AbstractType; diff --git a/src/Sylius/Bundle/ApiBundle/Form/Type/ProductVariantType.php b/src/Sylius/Bundle/AdminApiBundle/Form/Type/ProductVariantType.php similarity index 95% rename from src/Sylius/Bundle/ApiBundle/Form/Type/ProductVariantType.php rename to src/Sylius/Bundle/AdminApiBundle/Form/Type/ProductVariantType.php index 7199341f1a..67529ed093 100644 --- a/src/Sylius/Bundle/ApiBundle/Form/Type/ProductVariantType.php +++ b/src/Sylius/Bundle/AdminApiBundle/Form/Type/ProductVariantType.php @@ -9,7 +9,7 @@ * file that was distributed with this source code. */ -namespace Sylius\Bundle\ApiBundle\Form\Type; +namespace Sylius\Bundle\AdminApiBundle\Form\Type; use Sylius\Bundle\ProductBundle\Form\Type\ProductVariantType as BaseProductVariantType; use Symfony\Component\Form\AbstractType; diff --git a/src/Sylius/Bundle/ApiBundle/Model/AccessToken.php b/src/Sylius/Bundle/AdminApiBundle/Model/AccessToken.php similarity index 90% rename from src/Sylius/Bundle/ApiBundle/Model/AccessToken.php rename to src/Sylius/Bundle/AdminApiBundle/Model/AccessToken.php index 0c68f32cb6..bb1b97b8fa 100644 --- a/src/Sylius/Bundle/ApiBundle/Model/AccessToken.php +++ b/src/Sylius/Bundle/AdminApiBundle/Model/AccessToken.php @@ -9,7 +9,7 @@ * file that was distributed with this source code. */ -namespace Sylius\Bundle\ApiBundle\Model; +namespace Sylius\Bundle\AdminApiBundle\Model; use FOS\OAuthServerBundle\Entity\AccessToken as BaseAccessToken; diff --git a/src/Sylius/Bundle/ApiBundle/Model/AccessTokenInterface.php b/src/Sylius/Bundle/AdminApiBundle/Model/AccessTokenInterface.php similarity index 91% rename from src/Sylius/Bundle/ApiBundle/Model/AccessTokenInterface.php rename to src/Sylius/Bundle/AdminApiBundle/Model/AccessTokenInterface.php index 8a52dda262..7dc7744ee5 100644 --- a/src/Sylius/Bundle/ApiBundle/Model/AccessTokenInterface.php +++ b/src/Sylius/Bundle/AdminApiBundle/Model/AccessTokenInterface.php @@ -9,7 +9,7 @@ * file that was distributed with this source code. */ -namespace Sylius\Bundle\ApiBundle\Model; +namespace Sylius\Bundle\AdminApiBundle\Model; use FOS\OAuthServerBundle\Model\AccessTokenInterface as BaseAccessTokenInterface; use Sylius\Component\Resource\Model\ResourceInterface; diff --git a/src/Sylius/Bundle/ApiBundle/Model/AuthCode.php b/src/Sylius/Bundle/AdminApiBundle/Model/AuthCode.php similarity index 89% rename from src/Sylius/Bundle/ApiBundle/Model/AuthCode.php rename to src/Sylius/Bundle/AdminApiBundle/Model/AuthCode.php index 3cae1ab616..86c3b88af0 100644 --- a/src/Sylius/Bundle/ApiBundle/Model/AuthCode.php +++ b/src/Sylius/Bundle/AdminApiBundle/Model/AuthCode.php @@ -9,7 +9,7 @@ * file that was distributed with this source code. */ -namespace Sylius\Bundle\ApiBundle\Model; +namespace Sylius\Bundle\AdminApiBundle\Model; use FOS\OAuthServerBundle\Entity\AuthCode as BaseAuthCode; diff --git a/src/Sylius/Bundle/ApiBundle/Model/AuthCodeInterface.php b/src/Sylius/Bundle/AdminApiBundle/Model/AuthCodeInterface.php similarity index 91% rename from src/Sylius/Bundle/ApiBundle/Model/AuthCodeInterface.php rename to src/Sylius/Bundle/AdminApiBundle/Model/AuthCodeInterface.php index 65137f2d1d..2c07bcb22e 100644 --- a/src/Sylius/Bundle/ApiBundle/Model/AuthCodeInterface.php +++ b/src/Sylius/Bundle/AdminApiBundle/Model/AuthCodeInterface.php @@ -9,7 +9,7 @@ * file that was distributed with this source code. */ -namespace Sylius\Bundle\ApiBundle\Model; +namespace Sylius\Bundle\AdminApiBundle\Model; use FOS\OAuthServerBundle\Model\AuthCodeInterface as BaseAuthCodeInterface; use Sylius\Component\Resource\Model\ResourceInterface; diff --git a/src/Sylius/Bundle/ApiBundle/Model/Client.php b/src/Sylius/Bundle/AdminApiBundle/Model/Client.php similarity index 91% rename from src/Sylius/Bundle/ApiBundle/Model/Client.php rename to src/Sylius/Bundle/AdminApiBundle/Model/Client.php index 19ebd7f147..5a87b11ea0 100644 --- a/src/Sylius/Bundle/ApiBundle/Model/Client.php +++ b/src/Sylius/Bundle/AdminApiBundle/Model/Client.php @@ -9,7 +9,7 @@ * file that was distributed with this source code. */ -namespace Sylius\Bundle\ApiBundle\Model; +namespace Sylius\Bundle\AdminApiBundle\Model; use FOS\OAuthServerBundle\Entity\Client as BaseClient; diff --git a/src/Sylius/Bundle/ApiBundle/Model/ClientInterface.php b/src/Sylius/Bundle/AdminApiBundle/Model/ClientInterface.php similarity index 91% rename from src/Sylius/Bundle/ApiBundle/Model/ClientInterface.php rename to src/Sylius/Bundle/AdminApiBundle/Model/ClientInterface.php index 82c26e2b6b..12640bb443 100644 --- a/src/Sylius/Bundle/ApiBundle/Model/ClientInterface.php +++ b/src/Sylius/Bundle/AdminApiBundle/Model/ClientInterface.php @@ -9,7 +9,7 @@ * file that was distributed with this source code. */ -namespace Sylius\Bundle\ApiBundle\Model; +namespace Sylius\Bundle\AdminApiBundle\Model; use FOS\OAuthServerBundle\Model\ClientInterface as BaseClientInterface; use Sylius\Component\Resource\Model\ResourceInterface; diff --git a/src/Sylius/Bundle/ApiBundle/Model/ClientManager.php b/src/Sylius/Bundle/AdminApiBundle/Model/ClientManager.php similarity index 92% rename from src/Sylius/Bundle/ApiBundle/Model/ClientManager.php rename to src/Sylius/Bundle/AdminApiBundle/Model/ClientManager.php index f2e3371bbd..41a278dc15 100644 --- a/src/Sylius/Bundle/ApiBundle/Model/ClientManager.php +++ b/src/Sylius/Bundle/AdminApiBundle/Model/ClientManager.php @@ -9,7 +9,7 @@ * file that was distributed with this source code. */ -namespace Sylius\Bundle\ApiBundle\Model; +namespace Sylius\Bundle\AdminApiBundle\Model; use FOS\OAuthServerBundle\Entity\ClientManager as BaseClientManager; diff --git a/src/Sylius/Bundle/ApiBundle/Model/RefreshToken.php b/src/Sylius/Bundle/AdminApiBundle/Model/RefreshToken.php similarity index 90% rename from src/Sylius/Bundle/ApiBundle/Model/RefreshToken.php rename to src/Sylius/Bundle/AdminApiBundle/Model/RefreshToken.php index f0dcfdfb44..bedcf2c188 100644 --- a/src/Sylius/Bundle/ApiBundle/Model/RefreshToken.php +++ b/src/Sylius/Bundle/AdminApiBundle/Model/RefreshToken.php @@ -9,7 +9,7 @@ * file that was distributed with this source code. */ -namespace Sylius\Bundle\ApiBundle\Model; +namespace Sylius\Bundle\AdminApiBundle\Model; use FOS\OAuthServerBundle\Entity\RefreshToken as BaseRefreshToken; diff --git a/src/Sylius/Bundle/ApiBundle/Model/RefreshTokenInterface.php b/src/Sylius/Bundle/AdminApiBundle/Model/RefreshTokenInterface.php similarity index 91% rename from src/Sylius/Bundle/ApiBundle/Model/RefreshTokenInterface.php rename to src/Sylius/Bundle/AdminApiBundle/Model/RefreshTokenInterface.php index c4394fad9b..b6625d37a8 100644 --- a/src/Sylius/Bundle/ApiBundle/Model/RefreshTokenInterface.php +++ b/src/Sylius/Bundle/AdminApiBundle/Model/RefreshTokenInterface.php @@ -9,7 +9,7 @@ * file that was distributed with this source code. */ -namespace Sylius\Bundle\ApiBundle\Model; +namespace Sylius\Bundle\AdminApiBundle\Model; use FOS\OAuthServerBundle\Model\RefreshTokenInterface as BaseRefreshTokenInterface; use Sylius\Component\Resource\Model\ResourceInterface; diff --git a/src/Sylius/Bundle/ApiBundle/Model/UserInterface.php b/src/Sylius/Bundle/AdminApiBundle/Model/UserInterface.php similarity index 89% rename from src/Sylius/Bundle/ApiBundle/Model/UserInterface.php rename to src/Sylius/Bundle/AdminApiBundle/Model/UserInterface.php index 3d6e5e22c1..2008b323b9 100644 --- a/src/Sylius/Bundle/ApiBundle/Model/UserInterface.php +++ b/src/Sylius/Bundle/AdminApiBundle/Model/UserInterface.php @@ -9,7 +9,7 @@ * file that was distributed with this source code. */ -namespace Sylius\Bundle\ApiBundle\Model; +namespace Sylius\Bundle\AdminApiBundle\Model; use Symfony\Component\Security\Core\User\UserInterface as BaseUserInterface; diff --git a/src/Sylius/Bundle/ApiBundle/README.md b/src/Sylius/Bundle/AdminApiBundle/README.md similarity index 88% rename from src/Sylius/Bundle/ApiBundle/README.md rename to src/Sylius/Bundle/AdminApiBundle/README.md index 7ade14e8b4..79fa25d3d7 100644 --- a/src/Sylius/Bundle/ApiBundle/README.md +++ b/src/Sylius/Bundle/AdminApiBundle/README.md @@ -1,4 +1,4 @@ -SyliusApiBundle [![Build status...](https://secure.travis-ci.org/Sylius/SyliusApiBundle.png?branch=master)](http://travis-ci.org/Sylius/SyliusApiBundle) +SyliusAdminApiBundle [![Build status...](https://secure.travis-ci.org/Sylius/SyliusAdminApiBundle.png?branch=master)](http://travis-ci.org/Sylius/SyliusAdminApiBundle) =============== Sylius REST API bundle. diff --git a/src/Sylius/Bundle/AdminApiBundle/Resources/config/app/config.yml b/src/Sylius/Bundle/AdminApiBundle/Resources/config/app/config.yml new file mode 100644 index 0000000000..98b60279f5 --- /dev/null +++ b/src/Sylius/Bundle/AdminApiBundle/Resources/config/app/config.yml @@ -0,0 +1,19 @@ +# This file is part of the Sylius package. +# (c) Paweł Jędrzejewski + +imports: + - { resource: "@SyliusAdminApiBundle/Resources/config/app/fixtures.yml" } + + - { resource: "@SyliusAdminApiBundle/Resources/config/grids/cart.yml" } + - { resource: "@SyliusAdminApiBundle/Resources/config/grids/payments.yml" } + - { resource: "@SyliusAdminApiBundle/Resources/config/grids/product.yml" } + - { resource: "@SyliusAdminApiBundle/Resources/config/grids/product_variant.yml" } + - { resource: "@SyliusAdminApiBundle/Resources/config/grids/promotion.yml" } + - { resource: "@SyliusAdminApiBundle/Resources/config/grids/shipments.yml" } + - { resource: "@SyliusAdminApiBundle/Resources/config/grids/taxon.yml" } + +sylius_admin_api: + resources: + api_user: + classes: + model: "%sylius.model.admin_user.class%" diff --git a/src/Sylius/Bundle/ApiBundle/Resources/config/app/fixtures.yml b/src/Sylius/Bundle/AdminApiBundle/Resources/config/app/fixtures.yml similarity index 100% rename from src/Sylius/Bundle/ApiBundle/Resources/config/app/fixtures.yml rename to src/Sylius/Bundle/AdminApiBundle/Resources/config/app/fixtures.yml diff --git a/src/Sylius/Bundle/ApiBundle/Resources/config/doctrine/model/AccessToken.orm.xml b/src/Sylius/Bundle/AdminApiBundle/Resources/config/doctrine/model/AccessToken.orm.xml similarity index 84% rename from src/Sylius/Bundle/ApiBundle/Resources/config/doctrine/model/AccessToken.orm.xml rename to src/Sylius/Bundle/AdminApiBundle/Resources/config/doctrine/model/AccessToken.orm.xml index e1510c03e4..8a03509504 100644 --- a/src/Sylius/Bundle/ApiBundle/Resources/config/doctrine/model/AccessToken.orm.xml +++ b/src/Sylius/Bundle/AdminApiBundle/Resources/config/doctrine/model/AccessToken.orm.xml @@ -12,15 +12,15 @@ --> - + - + - + diff --git a/src/Sylius/Bundle/ApiBundle/Resources/config/doctrine/model/AuthCode.orm.xml b/src/Sylius/Bundle/AdminApiBundle/Resources/config/doctrine/model/AuthCode.orm.xml similarity index 84% rename from src/Sylius/Bundle/ApiBundle/Resources/config/doctrine/model/AuthCode.orm.xml rename to src/Sylius/Bundle/AdminApiBundle/Resources/config/doctrine/model/AuthCode.orm.xml index c0991ad770..fa60dab2b1 100644 --- a/src/Sylius/Bundle/ApiBundle/Resources/config/doctrine/model/AuthCode.orm.xml +++ b/src/Sylius/Bundle/AdminApiBundle/Resources/config/doctrine/model/AuthCode.orm.xml @@ -12,15 +12,15 @@ --> - + - + - + diff --git a/src/Sylius/Bundle/ApiBundle/Resources/config/doctrine/model/Client.orm.xml b/src/Sylius/Bundle/AdminApiBundle/Resources/config/doctrine/model/Client.orm.xml similarity index 86% rename from src/Sylius/Bundle/ApiBundle/Resources/config/doctrine/model/Client.orm.xml rename to src/Sylius/Bundle/AdminApiBundle/Resources/config/doctrine/model/Client.orm.xml index cb16238ad7..be6bdd09e6 100644 --- a/src/Sylius/Bundle/ApiBundle/Resources/config/doctrine/model/Client.orm.xml +++ b/src/Sylius/Bundle/AdminApiBundle/Resources/config/doctrine/model/Client.orm.xml @@ -12,7 +12,7 @@ --> - + diff --git a/src/Sylius/Bundle/ApiBundle/Resources/config/doctrine/model/RefreshToken.orm.xml b/src/Sylius/Bundle/AdminApiBundle/Resources/config/doctrine/model/RefreshToken.orm.xml similarity index 83% rename from src/Sylius/Bundle/ApiBundle/Resources/config/doctrine/model/RefreshToken.orm.xml rename to src/Sylius/Bundle/AdminApiBundle/Resources/config/doctrine/model/RefreshToken.orm.xml index 792f1a0fe2..3bbce1635c 100644 --- a/src/Sylius/Bundle/ApiBundle/Resources/config/doctrine/model/RefreshToken.orm.xml +++ b/src/Sylius/Bundle/AdminApiBundle/Resources/config/doctrine/model/RefreshToken.orm.xml @@ -12,15 +12,15 @@ --> - + - + - + diff --git a/src/Sylius/Bundle/ApiBundle/Resources/config/grids/cart.yml b/src/Sylius/Bundle/AdminApiBundle/Resources/config/grids/cart.yml similarity index 98% rename from src/Sylius/Bundle/ApiBundle/Resources/config/grids/cart.yml rename to src/Sylius/Bundle/AdminApiBundle/Resources/config/grids/cart.yml index b6d730e2aa..c6246ef713 100644 --- a/src/Sylius/Bundle/ApiBundle/Resources/config/grids/cart.yml +++ b/src/Sylius/Bundle/AdminApiBundle/Resources/config/grids/cart.yml @@ -1,6 +1,6 @@ sylius_grid: grids: - sylius_api_cart: + sylius_admin_api_cart: driver: name: doctrine/orm options: diff --git a/src/Sylius/Bundle/ApiBundle/Resources/config/grids/payments.yml b/src/Sylius/Bundle/AdminApiBundle/Resources/config/grids/payments.yml similarity index 95% rename from src/Sylius/Bundle/ApiBundle/Resources/config/grids/payments.yml rename to src/Sylius/Bundle/AdminApiBundle/Resources/config/grids/payments.yml index 047e9d0feb..adccceee48 100644 --- a/src/Sylius/Bundle/ApiBundle/Resources/config/grids/payments.yml +++ b/src/Sylius/Bundle/AdminApiBundle/Resources/config/grids/payments.yml @@ -1,6 +1,6 @@ sylius_grid: grids: - sylius_api_payment: + sylius_admin_api_payment: driver: name: doctrine/orm options: diff --git a/src/Sylius/Bundle/ApiBundle/Resources/config/grids/product.yml b/src/Sylius/Bundle/AdminApiBundle/Resources/config/grids/product.yml similarity index 95% rename from src/Sylius/Bundle/ApiBundle/Resources/config/grids/product.yml rename to src/Sylius/Bundle/AdminApiBundle/Resources/config/grids/product.yml index 8604f64039..dbf5756af6 100644 --- a/src/Sylius/Bundle/ApiBundle/Resources/config/grids/product.yml +++ b/src/Sylius/Bundle/AdminApiBundle/Resources/config/grids/product.yml @@ -1,6 +1,6 @@ sylius_grid: grids: - sylius_api_product: + sylius_admin_api_product: driver: name: doctrine/orm options: diff --git a/src/Sylius/Bundle/ApiBundle/Resources/config/grids/product_variant.yml b/src/Sylius/Bundle/AdminApiBundle/Resources/config/grids/product_variant.yml similarity index 95% rename from src/Sylius/Bundle/ApiBundle/Resources/config/grids/product_variant.yml rename to src/Sylius/Bundle/AdminApiBundle/Resources/config/grids/product_variant.yml index ef91e07860..85e34563d5 100644 --- a/src/Sylius/Bundle/ApiBundle/Resources/config/grids/product_variant.yml +++ b/src/Sylius/Bundle/AdminApiBundle/Resources/config/grids/product_variant.yml @@ -1,6 +1,6 @@ sylius_grid: grids: - sylius_api_product_variant: + sylius_admin_api_product_variant: driver: name: doctrine/orm options: diff --git a/src/Sylius/Bundle/ApiBundle/Resources/config/grids/promotion.yml b/src/Sylius/Bundle/AdminApiBundle/Resources/config/grids/promotion.yml similarity index 96% rename from src/Sylius/Bundle/ApiBundle/Resources/config/grids/promotion.yml rename to src/Sylius/Bundle/AdminApiBundle/Resources/config/grids/promotion.yml index e3af9606f4..ea69c32359 100644 --- a/src/Sylius/Bundle/ApiBundle/Resources/config/grids/promotion.yml +++ b/src/Sylius/Bundle/AdminApiBundle/Resources/config/grids/promotion.yml @@ -1,6 +1,6 @@ sylius_grid: grids: - sylius_api_promotion: + sylius_admin_api_promotion: driver: name: doctrine/orm options: diff --git a/src/Sylius/Bundle/ApiBundle/Resources/config/grids/shipments.yml b/src/Sylius/Bundle/AdminApiBundle/Resources/config/grids/shipments.yml similarity index 94% rename from src/Sylius/Bundle/ApiBundle/Resources/config/grids/shipments.yml rename to src/Sylius/Bundle/AdminApiBundle/Resources/config/grids/shipments.yml index 09b420194a..fddcc4a40c 100644 --- a/src/Sylius/Bundle/ApiBundle/Resources/config/grids/shipments.yml +++ b/src/Sylius/Bundle/AdminApiBundle/Resources/config/grids/shipments.yml @@ -1,6 +1,6 @@ sylius_grid: grids: - sylius_api_shipment: + sylius_admin_api_shipment: driver: name: doctrine/orm options: diff --git a/src/Sylius/Bundle/ApiBundle/Resources/config/grids/taxon.yml b/src/Sylius/Bundle/AdminApiBundle/Resources/config/grids/taxon.yml similarity index 93% rename from src/Sylius/Bundle/ApiBundle/Resources/config/grids/taxon.yml rename to src/Sylius/Bundle/AdminApiBundle/Resources/config/grids/taxon.yml index b90fa1663e..dd2e2b6598 100644 --- a/src/Sylius/Bundle/ApiBundle/Resources/config/grids/taxon.yml +++ b/src/Sylius/Bundle/AdminApiBundle/Resources/config/grids/taxon.yml @@ -1,6 +1,6 @@ sylius_grid: grids: - sylius_api_taxon: + sylius_admin_api_taxon: driver: name: doctrine/orm options: diff --git a/src/Sylius/Bundle/ApiBundle/Resources/config/routing.yml b/src/Sylius/Bundle/AdminApiBundle/Resources/config/routing.yml similarity index 67% rename from src/Sylius/Bundle/ApiBundle/Resources/config/routing.yml rename to src/Sylius/Bundle/AdminApiBundle/Resources/config/routing.yml index 7d951e7b24..353d14e48c 100644 --- a/src/Sylius/Bundle/ApiBundle/Resources/config/routing.yml +++ b/src/Sylius/Bundle/AdminApiBundle/Resources/config/routing.yml @@ -4,6 +4,6 @@ fos_oauth_server_token: resource: "@FOSOAuthServerBundle/Resources/config/routing/token.xml" -sylius_api: - resource: "@SyliusApiBundle/Resources/config/routing/main.yml" +sylius_admin_api: + resource: "@SyliusAdminApiBundle/Resources/config/routing/main.yml" prefix: /v{version} diff --git a/src/Sylius/Bundle/ApiBundle/Resources/config/routing/adjustment.yml b/src/Sylius/Bundle/AdminApiBundle/Resources/config/routing/adjustment.yml similarity index 86% rename from src/Sylius/Bundle/ApiBundle/Resources/config/routing/adjustment.yml rename to src/Sylius/Bundle/AdminApiBundle/Resources/config/routing/adjustment.yml index 49fb61be76..c646ad4b0a 100644 --- a/src/Sylius/Bundle/ApiBundle/Resources/config/routing/adjustment.yml +++ b/src/Sylius/Bundle/AdminApiBundle/Resources/config/routing/adjustment.yml @@ -1,4 +1,4 @@ -sylius_api_adjustment_index: +sylius_admin_api_adjustment_index: path: / methods: [GET] defaults: @@ -10,7 +10,7 @@ sylius_api_adjustment_index: arguments: [$orderId] paginate: false -sylius_api_adjustment_create: +sylius_admin_api_adjustment_create: path: / methods: [POST] defaults: @@ -18,7 +18,7 @@ sylius_api_adjustment_create: _sylius: serialization_version: $version -sylius_api_adjustment_update: +sylius_admin_api_adjustment_update: path: /{id} methods: [PUT, PATCH] defaults: @@ -26,7 +26,7 @@ sylius_api_adjustment_update: _sylius: serialization_version: $version -sylius_api_adjustment_delete: +sylius_admin_api_adjustment_delete: path: /{id} methods: [DELETE] defaults: diff --git a/src/Sylius/Bundle/ApiBundle/Resources/config/routing/cart.yml b/src/Sylius/Bundle/AdminApiBundle/Resources/config/routing/cart.yml similarity index 78% rename from src/Sylius/Bundle/ApiBundle/Resources/config/routing/cart.yml rename to src/Sylius/Bundle/AdminApiBundle/Resources/config/routing/cart.yml index 3d9e3aa8be..58c02ef7e9 100644 --- a/src/Sylius/Bundle/ApiBundle/Resources/config/routing/cart.yml +++ b/src/Sylius/Bundle/AdminApiBundle/Resources/config/routing/cart.yml @@ -1,37 +1,37 @@ # This file is part of the Sylius package. # (c) Paweł Jędrzejewski -sylius_api_carts: +sylius_admin_api_carts: resource: | alias: sylius.order path: '/' only: [index] - grid: sylius_api_cart - section: api + grid: sylius_admin_api_cart + section: admin_api serialization_version: $version type: sylius.resource_api -sylius_api_cart_create: +sylius_admin_api_cart_create: path: / methods: [POST] defaults: _controller: sylius.controller.order:createAction _sylius: serialization_version: $version - form: Sylius\Bundle\ApiBundle\Form\Type\OrderType + form: Sylius\Bundle\AdminApiBundle\Form\Type\OrderType serialization_groups: [DetailedCart] -sylius_api_cart_update: +sylius_admin_api_cart_update: path: /{id} methods: [PUT, PATCH] defaults: _controller: sylius.controller.order:updateAction _sylius: serialization_version: $version - form: Sylius\Bundle\ApiBundle\Form\Type\OrderPromotionCouponType + form: Sylius\Bundle\AdminApiBundle\Form\Type\OrderPromotionCouponType serialization_groups: [DetailedCart] -sylius_api_cart_delete: +sylius_admin_api_cart_delete: path: /{id} methods: [DELETE] defaults: @@ -44,7 +44,7 @@ sylius_api_cart_delete: method: findCartById arguments: [$id] -sylius_api_cart_show: +sylius_admin_api_cart_show: path: /{id} methods: [GET] defaults: diff --git a/src/Sylius/Bundle/ApiBundle/Resources/config/routing/cart_item.yml b/src/Sylius/Bundle/AdminApiBundle/Resources/config/routing/cart_item.yml similarity index 75% rename from src/Sylius/Bundle/ApiBundle/Resources/config/routing/cart_item.yml rename to src/Sylius/Bundle/AdminApiBundle/Resources/config/routing/cart_item.yml index 343f5ec412..50357ca678 100644 --- a/src/Sylius/Bundle/ApiBundle/Resources/config/routing/cart_item.yml +++ b/src/Sylius/Bundle/AdminApiBundle/Resources/config/routing/cart_item.yml @@ -1,27 +1,27 @@ # This file is part of the Sylius package. # (c) Paweł Jędrzejewski -sylius_api_cart_item_create: +sylius_admin_api_cart_item_create: path: /items/ methods: [POST] defaults: _controller: sylius.controller.order_item:createAction _sylius: serialization_version: $version - form: Sylius\Bundle\ApiBundle\Form\Type\OrderItemType + form: Sylius\Bundle\AdminApiBundle\Form\Type\OrderItemType factory: method: createForCart arguments: - "expr:notFoundOnNull(service('sylius.repository.order').findCartById($cartId))" serialization_groups: [DetailedCart] -sylius_api_cart_item: +sylius_admin_api_cart_item: resource: | alias: sylius.order_item path: 'items' only: [update, delete] - section: api - form: Sylius\Bundle\ApiBundle\Form\Type\OrderItemType + section: admin_api + form: Sylius\Bundle\AdminApiBundle\Form\Type\OrderItemType serialization_version: $version criteria: cart: $cartId diff --git a/src/Sylius/Bundle/ApiBundle/Resources/config/routing/channel.yml b/src/Sylius/Bundle/AdminApiBundle/Resources/config/routing/channel.yml similarity index 84% rename from src/Sylius/Bundle/ApiBundle/Resources/config/routing/channel.yml rename to src/Sylius/Bundle/AdminApiBundle/Resources/config/routing/channel.yml index df2e2e2e02..64c95a4b46 100644 --- a/src/Sylius/Bundle/ApiBundle/Resources/config/routing/channel.yml +++ b/src/Sylius/Bundle/AdminApiBundle/Resources/config/routing/channel.yml @@ -1,11 +1,11 @@ # This file is part of the Sylius package. # (c) Paweł Jędrzejewski -sylius_api_channel: +sylius_admin_api_channel: resource: | identifier: code alias: sylius.channel - section: api + section: admin_api only: ['show', 'index'] serialization_version: $version criteria: diff --git a/src/Sylius/Bundle/ApiBundle/Resources/config/routing/checkout.yml b/src/Sylius/Bundle/AdminApiBundle/Resources/config/routing/checkout.yml similarity index 86% rename from src/Sylius/Bundle/ApiBundle/Resources/config/routing/checkout.yml rename to src/Sylius/Bundle/AdminApiBundle/Resources/config/routing/checkout.yml index d269bdd1f5..121fa811b5 100644 --- a/src/Sylius/Bundle/ApiBundle/Resources/config/routing/checkout.yml +++ b/src/Sylius/Bundle/AdminApiBundle/Resources/config/routing/checkout.yml @@ -2,7 +2,7 @@ # (c) Paweł Jędrzejewski # -sylius_api_checkout_show: +sylius_admin_api_checkout_show: path: /{id} methods: [GET] defaults: @@ -11,14 +11,14 @@ sylius_api_checkout_show: serialization_version: $version serialization_groups: [Detailed] -sylius_api_checkout_addressing: +sylius_admin_api_checkout_addressing: path: /addressing/{orderId} methods: [PUT] defaults: _controller: sylius.controller.order:updateAction _sylius: serialization_version: $version - form: Sylius\Bundle\ApiBundle\Form\Type\AddressType + form: Sylius\Bundle\AdminApiBundle\Form\Type\AddressType repository: method: find arguments: [$orderId] @@ -26,13 +26,13 @@ sylius_api_checkout_addressing: graph: sylius_order_checkout transition: address -sylius_api_checkout_available_shipping_methods: +sylius_admin_api_checkout_available_shipping_methods: path: /select-shipping/{orderId} methods: [GET] defaults: _controller: sylius.controller.show_available_shipping_methods:showAction -sylius_api_checkout_select_shipping: +sylius_admin_api_checkout_select_shipping: path: /select-shipping/{orderId} methods: [PUT] defaults: @@ -47,13 +47,13 @@ sylius_api_checkout_select_shipping: graph: sylius_order_checkout transition: select_shipping -sylius_api_checkout_available_payment_methods: +sylius_admin_api_checkout_available_payment_methods: path: /select-payment/{orderId} methods: [GET] defaults: _controller: sylius.controller.show_available_payment_methods:showAction -sylius_api_checkout_select_payment: +sylius_admin_api_checkout_select_payment: path: /select-payment/{orderId} methods: [PUT, PATCH] defaults: @@ -68,7 +68,7 @@ sylius_api_checkout_select_payment: graph: sylius_order_checkout transition: select_payment -sylius_api_checkout_complete: +sylius_admin_api_checkout_complete: path: /complete/{orderId} methods: [PUT] defaults: diff --git a/src/Sylius/Bundle/ApiBundle/Resources/config/routing/country.yml b/src/Sylius/Bundle/AdminApiBundle/Resources/config/routing/country.yml similarity index 84% rename from src/Sylius/Bundle/ApiBundle/Resources/config/routing/country.yml rename to src/Sylius/Bundle/AdminApiBundle/Resources/config/routing/country.yml index 968aadf181..f6372f202a 100644 --- a/src/Sylius/Bundle/ApiBundle/Resources/config/routing/country.yml +++ b/src/Sylius/Bundle/AdminApiBundle/Resources/config/routing/country.yml @@ -1,11 +1,11 @@ # This file is part of the Sylius package. # (c) Paweł Jędrzejewski -sylius_api_country: +sylius_admin_api_country: resource: | identifier: code alias: sylius.country - section: api + section: admin_api except: ['update'] serialization_version: $version criteria: diff --git a/src/Sylius/Bundle/ApiBundle/Resources/config/routing/currency.yml b/src/Sylius/Bundle/AdminApiBundle/Resources/config/routing/currency.yml similarity index 83% rename from src/Sylius/Bundle/ApiBundle/Resources/config/routing/currency.yml rename to src/Sylius/Bundle/AdminApiBundle/Resources/config/routing/currency.yml index 0d9760d374..c5f36b6e8c 100644 --- a/src/Sylius/Bundle/ApiBundle/Resources/config/routing/currency.yml +++ b/src/Sylius/Bundle/AdminApiBundle/Resources/config/routing/currency.yml @@ -1,11 +1,11 @@ # This file is part of the Sylius package. # (c) Paweł Jędrzejewski -sylius_api_currency: +sylius_admin_api_currency: resource: | identifier: code alias: sylius.currency - section: api + section: admin_api except: ['update'] serialization_version: $version criteria: diff --git a/src/Sylius/Bundle/ApiBundle/Resources/config/routing/customer.yml b/src/Sylius/Bundle/AdminApiBundle/Resources/config/routing/customer.yml similarity index 81% rename from src/Sylius/Bundle/ApiBundle/Resources/config/routing/customer.yml rename to src/Sylius/Bundle/AdminApiBundle/Resources/config/routing/customer.yml index f525cb5110..1d03757cbd 100644 --- a/src/Sylius/Bundle/ApiBundle/Resources/config/routing/customer.yml +++ b/src/Sylius/Bundle/AdminApiBundle/Resources/config/routing/customer.yml @@ -1,7 +1,7 @@ # This file is part of the Sylius package. # (c) Paweł Jędrzejewski -sylius_api_customer_index: +sylius_admin_api_customer_index: path: / methods: [GET] defaults: @@ -14,7 +14,7 @@ sylius_api_customer_index: sorting: id: desc -sylius_api_customer_show: +sylius_admin_api_customer_show: path: /{id} methods: [GET] defaults: @@ -23,7 +23,7 @@ sylius_api_customer_show: serialization_version: $version serialization_groups: [Detailed] -sylius_api_customer_create: +sylius_admin_api_customer_create: path: / methods: [POST] defaults: @@ -32,9 +32,9 @@ sylius_api_customer_create: serialization_version: $version serialization_groups: [Detailed] form: - type: Sylius\Bundle\ApiBundle\Form\Type\CustomerProfileType + type: Sylius\Bundle\AdminApiBundle\Form\Type\CustomerProfileType -sylius_api_customer_update: +sylius_admin_api_customer_update: path: /{id} methods: [PUT, PATCH] defaults: @@ -42,9 +42,9 @@ sylius_api_customer_update: _sylius: serialization_version: $version form: - type: Sylius\Bundle\ApiBundle\Form\Type\CustomerProfileType + type: Sylius\Bundle\AdminApiBundle\Form\Type\CustomerProfileType -sylius_api_customer_delete: +sylius_admin_api_customer_delete: path: /{id} methods: [DELETE] defaults: @@ -53,7 +53,7 @@ sylius_api_customer_delete: serialization_version: $version csrf_protection: false -sylius_api_customer_order_index: +sylius_admin_api_customer_order_index: path: /{id}/orders/ methods: [GET] defaults: diff --git a/src/Sylius/Bundle/ApiBundle/Resources/config/routing/exchange_rate.yml b/src/Sylius/Bundle/AdminApiBundle/Resources/config/routing/exchange_rate.yml similarity index 89% rename from src/Sylius/Bundle/ApiBundle/Resources/config/routing/exchange_rate.yml rename to src/Sylius/Bundle/AdminApiBundle/Resources/config/routing/exchange_rate.yml index 7119a710fd..28969e7dc2 100644 --- a/src/Sylius/Bundle/ApiBundle/Resources/config/routing/exchange_rate.yml +++ b/src/Sylius/Bundle/AdminApiBundle/Resources/config/routing/exchange_rate.yml @@ -1,15 +1,15 @@ # This file is part of the Sylius package. # (c) Paweł Jędrzejewski -sylius_api_exchange_rate: +sylius_admin_api_exchange_rate: resource: | alias: sylius.exchange_rate - section: api + section: admin_api only: [index, create] serialization_version: $version type: sylius.resource_api -sylius_api_exchange_rate_update: +sylius_admin_api_exchange_rate_update: path: /exchange-rates/{sourceCurrencyCode}-{targetCurrencyCode} methods: [PUT, PATCH] defaults: @@ -21,7 +21,7 @@ sylius_api_exchange_rate_update: method: findOneWithCurrencyPair arguments: [$sourceCurrencyCode, $targetCurrencyCode] -sylius_api_exchange_rate_delete: +sylius_admin_api_exchange_rate_delete: path: /exchange-rates/{sourceCurrencyCode}-{targetCurrencyCode} methods: [DELETE] defaults: @@ -33,7 +33,7 @@ sylius_api_exchange_rate_delete: arguments: [$sourceCurrencyCode, $targetCurrencyCode] csrf_protection: false -sylius_api_exchange_rate_show: +sylius_admin_api_exchange_rate_show: path: /exchange-rates/{sourceCurrencyCode}-{targetCurrencyCode} methods: [GET] defaults: diff --git a/src/Sylius/Bundle/ApiBundle/Resources/config/routing/locale.yml b/src/Sylius/Bundle/AdminApiBundle/Resources/config/routing/locale.yml similarity index 84% rename from src/Sylius/Bundle/ApiBundle/Resources/config/routing/locale.yml rename to src/Sylius/Bundle/AdminApiBundle/Resources/config/routing/locale.yml index 80c7c06d6e..857b732ef8 100644 --- a/src/Sylius/Bundle/ApiBundle/Resources/config/routing/locale.yml +++ b/src/Sylius/Bundle/AdminApiBundle/Resources/config/routing/locale.yml @@ -1,11 +1,11 @@ # This file is part of the Sylius package. # (c) Paweł Jędrzejewski -sylius_api_locale: +sylius_admin_api_locale: resource: | identifier: code alias: sylius.locale - section: api + section: admin_api except: ['update'] serialization_version: $version criteria: diff --git a/src/Sylius/Bundle/AdminApiBundle/Resources/config/routing/main.yml b/src/Sylius/Bundle/AdminApiBundle/Resources/config/routing/main.yml new file mode 100644 index 0000000000..c0a26c0296 --- /dev/null +++ b/src/Sylius/Bundle/AdminApiBundle/Resources/config/routing/main.yml @@ -0,0 +1,96 @@ +# This file is part of the Sylius package. +# (c) Paweł Jędrzejewski + +sylius_admin_api_channel: + resource: "@SyliusAdminApiBundle/Resources/config/routing/channel.yml" + +sylius_admin_api_country: + resource: "@SyliusAdminApiBundle/Resources/config/routing/country.yml" + +sylius_admin_api_currency: + resource: "@SyliusAdminApiBundle/Resources/config/routing/currency.yml" + +sylius_admin_api_locale: + resource: "@SyliusAdminApiBundle/Resources/config/routing/locale.yml" + +sylius_admin_api_product: + resource: "@SyliusAdminApiBundle/Resources/config/routing/product.yml" + +sylius_admin_api_product_attribute: + resource: "@SyliusAdminApiBundle/Resources/config/routing/product_attribute.yml" + +sylius_admin_api_product_option: + resource: "@SyliusAdminApiBundle/Resources/config/routing/product_option.yml" + +sylius_admin_api_product_variant: + resource: "@SyliusAdminApiBundle/Resources/config/routing/product_variant.yml" + prefix: /products/{productCode} + +sylius_admin_api_promotion: + resource: "@SyliusAdminApiBundle/Resources/config/routing/promotion.yml" + +sylius_admin_api_promotion_coupon: + resource: "@SyliusAdminApiBundle/Resources/config/routing/promotion_coupon.yml" + prefix: /promotions/{promotionCode}/coupons + +sylius_admin_api_taxon: + resource: "@SyliusAdminApiBundle/Resources/config/routing/taxon.yml" + +sylius_admin_api_product_taxon_position: + resource: "@SyliusAdminApiBundle/Resources/config/routing/product_taxon_position.yml" + +sylius_admin_api_cart: + resource: "@SyliusAdminApiBundle/Resources/config/routing/cart.yml" + prefix: /carts + +sylius_admin_api_adjustment: + resource: "@SyliusAdminApiBundle/Resources/config/routing/adjustment.yml" + prefix: /orders/{orderId}/adjustments + +sylius_admin_api_cart_item: + resource: "@SyliusAdminApiBundle/Resources/config/routing/cart_item.yml" + prefix: /carts/{cartId} + +sylius_admin_api_order: + resource: "@SyliusAdminApiBundle/Resources/config/routing/order.yml" + +sylius_admin_api_checkout: + resource: "@SyliusAdminApiBundle/Resources/config/routing/checkout.yml" + prefix: /checkouts + +sylius_admin_api_tax_category: + resource: "@SyliusAdminApiBundle/Resources/config/routing/tax_category.yml" + +sylius_admin_api_tax_rate: + resource: "@SyliusAdminApiBundle/Resources/config/routing/tax_rate.yml" + +sylius_admin_api_shipping_category: + resource: "@SyliusAdminApiBundle/Resources/config/routing/shipping_category.yml" + +sylius_admin_api_shipping_method: + resource: "@SyliusAdminApiBundle/Resources/config/routing/shipping_method.yml" + +sylius_admin_api_shipment: + resource: "@SyliusAdminApiBundle/Resources/config/routing/shipment.yml" + +sylius_admin_api_payment_method: + resource: "@SyliusAdminApiBundle/Resources/config/routing/payment_method.yml" + +sylius_admin_api_payment: + resource: "@SyliusAdminApiBundle/Resources/config/routing/payment.yml" + +sylius_admin_api_exchange_rate: + resource: "@SyliusAdminApiBundle/Resources/config/routing/exchange_rate.yml" + +sylius_admin_api_province: + resource: "@SyliusAdminApiBundle/Resources/config/routing/province.yml" + prefix: /countries/{countryCode}/provinces + +sylius_admin_api_zone: + resource: "@SyliusAdminApiBundle/Resources/config/routing/zone.yml" + +sylius_admin_api_customer: + resource: "@SyliusAdminApiBundle/Resources/config/routing/customer.yml" + prefix: /customers + + diff --git a/src/Sylius/Bundle/ApiBundle/Resources/config/routing/order.yml b/src/Sylius/Bundle/AdminApiBundle/Resources/config/routing/order.yml similarity index 85% rename from src/Sylius/Bundle/ApiBundle/Resources/config/routing/order.yml rename to src/Sylius/Bundle/AdminApiBundle/Resources/config/routing/order.yml index fbf82a976b..59b4ca7013 100644 --- a/src/Sylius/Bundle/ApiBundle/Resources/config/routing/order.yml +++ b/src/Sylius/Bundle/AdminApiBundle/Resources/config/routing/order.yml @@ -1,28 +1,28 @@ # This file is part of the Sylius package. # (c) Paweł Jędrzejewski -sylius_api_order: +sylius_admin_api_order: resource: | alias: sylius.order - section: api + section: admin_api only: [show] grid: sylius_admin_order serialization_version: $version type: sylius.resource_api -sylius_api_order_cancel: +sylius_admin_api_order_cancel: path: /orders/{id}/cancel methods: [PUT] defaults: _controller: sylius.controller.order:applyStateMachineTransitionAction _sylius: - section: api + section: admin_api state_machine: graph: sylius_order transition: cancel return_content: false -sylius_api_order_shipment_ship: +sylius_admin_api_order_shipment_ship: path: /orders/{orderId}/shipments/{id}/ship methods: [PUT] defaults: @@ -37,10 +37,10 @@ sylius_api_order_shipment_ship: state_machine: graph: sylius_shipment transition: ship - section: api + section: admin_api form: Sylius\Bundle\ShippingBundle\Form\Type\ShipmentShipType -sylius_api_order_payment_complete: +sylius_admin_api_order_payment_complete: path: /orders/{orderId}/payments/{id}/complete methods: [PUT] defaults: @@ -55,5 +55,5 @@ sylius_api_order_payment_complete: state_machine: graph: sylius_payment transition: complete - section: api + section: admin_api return_content: false diff --git a/src/Sylius/Bundle/ApiBundle/Resources/config/routing/payment.yml b/src/Sylius/Bundle/AdminApiBundle/Resources/config/routing/payment.yml similarity index 70% rename from src/Sylius/Bundle/ApiBundle/Resources/config/routing/payment.yml rename to src/Sylius/Bundle/AdminApiBundle/Resources/config/routing/payment.yml index bc2f5dd7bf..b72e3c6bec 100644 --- a/src/Sylius/Bundle/ApiBundle/Resources/config/routing/payment.yml +++ b/src/Sylius/Bundle/AdminApiBundle/Resources/config/routing/payment.yml @@ -1,11 +1,11 @@ # This file is part of the Sylius package. # (c) Paweł Jędrzejewski -sylius_api_payments: +sylius_admin_api_payments: resource: | alias: sylius.payment - section: api + section: admin_api only: ['show', 'index'] - grid: sylius_api_payment + grid: sylius_admin_api_payment serialization_version: $version type: sylius.resource_api diff --git a/src/Sylius/Bundle/ApiBundle/Resources/config/routing/payment_method.yml b/src/Sylius/Bundle/AdminApiBundle/Resources/config/routing/payment_method.yml similarity index 82% rename from src/Sylius/Bundle/ApiBundle/Resources/config/routing/payment_method.yml rename to src/Sylius/Bundle/AdminApiBundle/Resources/config/routing/payment_method.yml index b12e550054..b547c3e172 100644 --- a/src/Sylius/Bundle/ApiBundle/Resources/config/routing/payment_method.yml +++ b/src/Sylius/Bundle/AdminApiBundle/Resources/config/routing/payment_method.yml @@ -1,11 +1,11 @@ # This file is part of the Sylius package. # (c) Paweł Jędrzejewski -sylius_api_payment_method: +sylius_admin_api_payment_method: resource: | identifier: code alias: sylius.payment_method - section: api + section: admin_api only: ['show'] serialization_version: $version criteria: diff --git a/src/Sylius/Bundle/ApiBundle/Resources/config/routing/product.yml b/src/Sylius/Bundle/AdminApiBundle/Resources/config/routing/product.yml similarity index 61% rename from src/Sylius/Bundle/ApiBundle/Resources/config/routing/product.yml rename to src/Sylius/Bundle/AdminApiBundle/Resources/config/routing/product.yml index 8049f431fe..600ed9de21 100644 --- a/src/Sylius/Bundle/ApiBundle/Resources/config/routing/product.yml +++ b/src/Sylius/Bundle/AdminApiBundle/Resources/config/routing/product.yml @@ -1,13 +1,13 @@ # This file is part of the Sylius package. # (c) Paweł Jędrzejewski -sylius_api_product: +sylius_admin_api_product: resource: | identifier: code alias: sylius.product - section: api - grid: sylius_api_product - form: Sylius\Bundle\ApiBundle\Form\Type\ProductType + section: admin_api + grid: sylius_admin_api_product + form: Sylius\Bundle\AdminApiBundle\Form\Type\ProductType serialization_version: $version criteria: code: $code diff --git a/src/Sylius/Bundle/ApiBundle/Resources/config/routing/product_attribute.yml b/src/Sylius/Bundle/AdminApiBundle/Resources/config/routing/product_attribute.yml similarity index 82% rename from src/Sylius/Bundle/ApiBundle/Resources/config/routing/product_attribute.yml rename to src/Sylius/Bundle/AdminApiBundle/Resources/config/routing/product_attribute.yml index 3ec15697e8..a6930f6c4a 100644 --- a/src/Sylius/Bundle/ApiBundle/Resources/config/routing/product_attribute.yml +++ b/src/Sylius/Bundle/AdminApiBundle/Resources/config/routing/product_attribute.yml @@ -1,11 +1,11 @@ # This file is part of the Sylius package. # (c) Paweł Jędrzejewski -sylius_api_product_attribute: +sylius_admin_api_product_attribute: resource: | identifier: code alias: sylius.product_attribute - section: api + section: admin_api only: ['index', 'show'] serialization_version: $version criteria: diff --git a/src/Sylius/Bundle/ApiBundle/Resources/config/routing/product_option.yml b/src/Sylius/Bundle/AdminApiBundle/Resources/config/routing/product_option.yml similarity index 83% rename from src/Sylius/Bundle/ApiBundle/Resources/config/routing/product_option.yml rename to src/Sylius/Bundle/AdminApiBundle/Resources/config/routing/product_option.yml index fe5724233a..e49d8db8c8 100644 --- a/src/Sylius/Bundle/ApiBundle/Resources/config/routing/product_option.yml +++ b/src/Sylius/Bundle/AdminApiBundle/Resources/config/routing/product_option.yml @@ -1,11 +1,11 @@ # This file is part of the Sylius package. # (c) Paweł Jędrzejewski -sylius_api_product_option: +sylius_admin_api_product_option: resource: | identifier: code alias: sylius.product_option - section: api + section: admin_api only: ['index', 'show'] serialization_version: $version criteria: diff --git a/src/Sylius/Bundle/ApiBundle/Resources/config/routing/product_taxon_position.yml b/src/Sylius/Bundle/AdminApiBundle/Resources/config/routing/product_taxon_position.yml similarity index 82% rename from src/Sylius/Bundle/ApiBundle/Resources/config/routing/product_taxon_position.yml rename to src/Sylius/Bundle/AdminApiBundle/Resources/config/routing/product_taxon_position.yml index e47ca5fb20..7204bb9b0a 100644 --- a/src/Sylius/Bundle/ApiBundle/Resources/config/routing/product_taxon_position.yml +++ b/src/Sylius/Bundle/AdminApiBundle/Resources/config/routing/product_taxon_position.yml @@ -1,4 +1,4 @@ -sylius_api_taxon_products_update_position: +sylius_admin_api_taxon_products_update_position: path: /taxons/{taxonCode}/products methods: [PUT] defaults: diff --git a/src/Sylius/Bundle/ApiBundle/Resources/config/routing/product_variant.yml b/src/Sylius/Bundle/AdminApiBundle/Resources/config/routing/product_variant.yml similarity index 76% rename from src/Sylius/Bundle/ApiBundle/Resources/config/routing/product_variant.yml rename to src/Sylius/Bundle/AdminApiBundle/Resources/config/routing/product_variant.yml index 1bc583b8a1..d7055f8aaf 100644 --- a/src/Sylius/Bundle/ApiBundle/Resources/config/routing/product_variant.yml +++ b/src/Sylius/Bundle/AdminApiBundle/Resources/config/routing/product_variant.yml @@ -1,12 +1,12 @@ # This file is part of the Sylius package. # (c) Paweł Jędrzejewski -sylius_api_product_variant: +sylius_admin_api_product_variant: resource: | path: 'variants' - grid: sylius_api_product_variant + grid: sylius_admin_api_product_variant alias: sylius.product_variant - section: api + section: admin_api only: ['index'] serialization_version: $version vars: @@ -15,7 +15,7 @@ sylius_api_product_variant: productCode: $productCode type: sylius.resource_api -sylius_api_product_variant_create: +sylius_admin_api_product_variant_create: path: /variants/ methods: [POST] defaults: @@ -23,47 +23,47 @@ sylius_api_product_variant_create: _sylius: serialization_groups: [Default, Detailed] serialization_version: $version - section: api - form: Sylius\Bundle\ApiBundle\Form\Type\ProductVariantType + section: admin_api + form: Sylius\Bundle\AdminApiBundle\Form\Type\ProductVariantType factory: method: createForProduct arguments: - expr:notFoundOnNull(service('sylius.repository.product').findOneByCode($productCode)) -sylius_api_product_variant_update: +sylius_admin_api_product_variant_update: path: /variants/{code} methods: [PUT, PATCH] defaults: _controller: sylius.controller.product_variant:updateAction _sylius: serialization_version: $version - section: api - form: Sylius\Bundle\ApiBundle\Form\Type\ProductVariantType + section: admin_api + form: Sylius\Bundle\AdminApiBundle\Form\Type\ProductVariantType repository: method: findOneByCodeAndProductCode arguments: [$code, $productCode] -sylius_api_product_variant_delete: +sylius_admin_api_product_variant_delete: path: /variants/{code} methods: [DELETE] defaults: _controller: sylius.controller.product_variant:deleteAction _sylius: serialization_version: $version - section: api + section: admin_api repository: method: findOneByCodeAndProductCode arguments: [$code, $productCode] csrf_protection: false -sylius_api_product_variant_show: +sylius_admin_api_product_variant_show: path: /variants/{code} methods: [GET] defaults: _controller: sylius.controller.product_variant:showAction _sylius: serialization_version: $version - section: api + section: admin_api serialization_groups: [Default, Detailed] repository: method: findOneByCodeAndProductCode diff --git a/src/Sylius/Bundle/ApiBundle/Resources/config/routing/promotion.yml b/src/Sylius/Bundle/AdminApiBundle/Resources/config/routing/promotion.yml similarity index 72% rename from src/Sylius/Bundle/ApiBundle/Resources/config/routing/promotion.yml rename to src/Sylius/Bundle/AdminApiBundle/Resources/config/routing/promotion.yml index 38134d138a..83f4332cb5 100644 --- a/src/Sylius/Bundle/ApiBundle/Resources/config/routing/promotion.yml +++ b/src/Sylius/Bundle/AdminApiBundle/Resources/config/routing/promotion.yml @@ -1,12 +1,12 @@ # This file is part of the Sylius package. # (c) Paweł Jędrzejewski -sylius_api_promotion: +sylius_admin_api_promotion: resource: | identifier: code alias: sylius.promotion - section: api - grid: sylius_api_promotion + section: admin_api + grid: sylius_admin_api_promotion serialization_version: $version criteria: code: $code diff --git a/src/Sylius/Bundle/ApiBundle/Resources/config/routing/promotion_coupon.yml b/src/Sylius/Bundle/AdminApiBundle/Resources/config/routing/promotion_coupon.yml similarity index 83% rename from src/Sylius/Bundle/ApiBundle/Resources/config/routing/promotion_coupon.yml rename to src/Sylius/Bundle/AdminApiBundle/Resources/config/routing/promotion_coupon.yml index b67553324b..348f88e4ab 100644 --- a/src/Sylius/Bundle/ApiBundle/Resources/config/routing/promotion_coupon.yml +++ b/src/Sylius/Bundle/AdminApiBundle/Resources/config/routing/promotion_coupon.yml @@ -1,7 +1,7 @@ # This file is part of the Sylius package. # (c) Paweł Jędrzejewski -sylius_api_promotion_coupon_index: +sylius_admin_api_promotion_coupon_index: path: / methods: [GET] defaults: @@ -9,18 +9,18 @@ sylius_api_promotion_coupon_index: _sylius: serialization_version: $version serialization_groups: [Default] - section: api + section: admin_api criteria: promotion: $promotionCode -sylius_api_promotion_coupon_create: +sylius_admin_api_promotion_coupon_create: path: / methods: [POST] defaults: _controller: sylius.controller.promotion_coupon:createAction _sylius: serialization_version: $version - section: api + section: admin_api factory: method: createForPromotion arguments: @@ -28,19 +28,19 @@ sylius_api_promotion_coupon_create: criteria: promotion: $promotionCode -sylius_api_promotion_coupon_update: +sylius_admin_api_promotion_coupon_update: path: /{code} methods: [PUT, PATCH] defaults: _controller: sylius.controller.promotion_coupon:updateAction _sylius: serialization_version: $version - section: api + section: admin_api repository: method: findOneByCodeAndPromotionCode arguments: [$code, $promotionCode] -sylius_api_promotion_coupon_show: +sylius_admin_api_promotion_coupon_show: path: /{code} methods: [GET] defaults: @@ -48,19 +48,19 @@ sylius_api_promotion_coupon_show: _sylius: serialization_version: $version serialization_groups: [Default, Detailed] - section: api + section: admin_api repository: method: findOneByCodeAndPromotionCode arguments: [$code, $promotionCode] -sylius_api_promotion_coupon_delete: +sylius_admin_api_promotion_coupon_delete: path: /{code} methods: [DELETE] defaults: _controller: sylius.controller.promotion_coupon:deleteAction _sylius: serialization_version: $version - section: api + section: admin_api csrf_protection: false repository: method: findOneByCodeAndPromotionCode diff --git a/src/Sylius/Bundle/ApiBundle/Resources/config/routing/province.yml b/src/Sylius/Bundle/AdminApiBundle/Resources/config/routing/province.yml similarity index 90% rename from src/Sylius/Bundle/ApiBundle/Resources/config/routing/province.yml rename to src/Sylius/Bundle/AdminApiBundle/Resources/config/routing/province.yml index bdda426111..e045a1d9c4 100644 --- a/src/Sylius/Bundle/ApiBundle/Resources/config/routing/province.yml +++ b/src/Sylius/Bundle/AdminApiBundle/Resources/config/routing/province.yml @@ -1,7 +1,7 @@ # This file is part of the Sylius package. # (c) Paweł Jędrzejewski -sylius_api_province_delete: +sylius_admin_api_province_delete: path: /{code} methods: [DELETE] defaults: @@ -12,7 +12,7 @@ sylius_api_province_delete: code: $code csrf_protection: false -sylius_api_province_show: +sylius_admin_api_province_show: path: /{code} methods: [GET] defaults: diff --git a/src/Sylius/Bundle/ApiBundle/Resources/config/routing/shipment.yml b/src/Sylius/Bundle/AdminApiBundle/Resources/config/routing/shipment.yml similarity index 69% rename from src/Sylius/Bundle/ApiBundle/Resources/config/routing/shipment.yml rename to src/Sylius/Bundle/AdminApiBundle/Resources/config/routing/shipment.yml index 5cdb09e114..ed49b99549 100644 --- a/src/Sylius/Bundle/ApiBundle/Resources/config/routing/shipment.yml +++ b/src/Sylius/Bundle/AdminApiBundle/Resources/config/routing/shipment.yml @@ -1,11 +1,11 @@ # This file is part of the Sylius package. # (c) Paweł Jędrzejewski -sylius_api_shipments: +sylius_admin_api_shipments: resource: | alias: sylius.shipment - section: api + section: admin_api only: ['show', 'index'] - grid: sylius_api_shipment + grid: sylius_admin_api_shipment serialization_version: $version type: sylius.resource_api diff --git a/src/Sylius/Bundle/ApiBundle/Resources/config/routing/shipping_category.yml b/src/Sylius/Bundle/AdminApiBundle/Resources/config/routing/shipping_category.yml similarity index 80% rename from src/Sylius/Bundle/ApiBundle/Resources/config/routing/shipping_category.yml rename to src/Sylius/Bundle/AdminApiBundle/Resources/config/routing/shipping_category.yml index f871b2bb35..753bf752c8 100644 --- a/src/Sylius/Bundle/ApiBundle/Resources/config/routing/shipping_category.yml +++ b/src/Sylius/Bundle/AdminApiBundle/Resources/config/routing/shipping_category.yml @@ -1,11 +1,11 @@ # This file is part of the Sylius package. # (c) Paweł Jędrzejewski -sylius_api_shipping_category: +sylius_admin_api_shipping_category: resource: | identifier: code alias: sylius.shipping_category - section: api + section: admin_api serialization_version: $version criteria: code: $code diff --git a/src/Sylius/Bundle/ApiBundle/Resources/config/routing/shipping_method.yml b/src/Sylius/Bundle/AdminApiBundle/Resources/config/routing/shipping_method.yml similarity index 82% rename from src/Sylius/Bundle/ApiBundle/Resources/config/routing/shipping_method.yml rename to src/Sylius/Bundle/AdminApiBundle/Resources/config/routing/shipping_method.yml index 948e629aa5..3016550b0c 100644 --- a/src/Sylius/Bundle/ApiBundle/Resources/config/routing/shipping_method.yml +++ b/src/Sylius/Bundle/AdminApiBundle/Resources/config/routing/shipping_method.yml @@ -1,11 +1,11 @@ # This file is part of the Sylius package. # (c) Paweł Jędrzejewski -sylius_api_shipping_method: +sylius_admin_api_shipping_method: resource: | identifier: code alias: sylius.shipping_method - section: api + section: admin_api only: ['show'] serialization_version: $version criteria: diff --git a/src/Sylius/Bundle/ApiBundle/Resources/config/routing/tax_category.yml b/src/Sylius/Bundle/AdminApiBundle/Resources/config/routing/tax_category.yml similarity index 81% rename from src/Sylius/Bundle/ApiBundle/Resources/config/routing/tax_category.yml rename to src/Sylius/Bundle/AdminApiBundle/Resources/config/routing/tax_category.yml index c1951782c1..359c3b7b2b 100644 --- a/src/Sylius/Bundle/ApiBundle/Resources/config/routing/tax_category.yml +++ b/src/Sylius/Bundle/AdminApiBundle/Resources/config/routing/tax_category.yml @@ -1,11 +1,11 @@ # This file is part of the Sylius package. # (c) Paweł Jędrzejewski -sylius_api_tax_category: +sylius_admin_api_tax_category: resource: | identifier: code alias: sylius.tax_category - section: api + section: admin_api serialization_version: $version criteria: code: $code diff --git a/src/Sylius/Bundle/ApiBundle/Resources/config/routing/tax_rate.yml b/src/Sylius/Bundle/AdminApiBundle/Resources/config/routing/tax_rate.yml similarity index 84% rename from src/Sylius/Bundle/ApiBundle/Resources/config/routing/tax_rate.yml rename to src/Sylius/Bundle/AdminApiBundle/Resources/config/routing/tax_rate.yml index 18a40b991d..5c9b5660d7 100644 --- a/src/Sylius/Bundle/ApiBundle/Resources/config/routing/tax_rate.yml +++ b/src/Sylius/Bundle/AdminApiBundle/Resources/config/routing/tax_rate.yml @@ -1,11 +1,11 @@ # This file is part of the Sylius package. # (c) Paweł Jędrzejewski -sylius_api_tax_rate: +sylius_admin_api_tax_rate: resource: | identifier: code alias: sylius.tax_rate - section: api + section: admin_api only: ['show', 'index'] serialization_version: $version criteria: diff --git a/src/Sylius/Bundle/ApiBundle/Resources/config/routing/taxon.yml b/src/Sylius/Bundle/AdminApiBundle/Resources/config/routing/taxon.yml similarity index 78% rename from src/Sylius/Bundle/ApiBundle/Resources/config/routing/taxon.yml rename to src/Sylius/Bundle/AdminApiBundle/Resources/config/routing/taxon.yml index 9a01148179..2069a8f587 100644 --- a/src/Sylius/Bundle/ApiBundle/Resources/config/routing/taxon.yml +++ b/src/Sylius/Bundle/AdminApiBundle/Resources/config/routing/taxon.yml @@ -1,13 +1,13 @@ # This file is part of the Sylius package. # (c) Paweł Jędrzejewski -sylius_api_taxon: +sylius_admin_api_taxon: resource: | identifier: code alias: sylius.taxon - section: api + section: admin_api form: Sylius\Bundle\TaxonomyBundle\Form\Type\TaxonType - grid: sylius_api_taxon + grid: sylius_admin_api_taxon serialization_version: $version criteria: code: $code diff --git a/src/Sylius/Bundle/ApiBundle/Resources/config/routing/zone.yml b/src/Sylius/Bundle/AdminApiBundle/Resources/config/routing/zone.yml similarity index 87% rename from src/Sylius/Bundle/ApiBundle/Resources/config/routing/zone.yml rename to src/Sylius/Bundle/AdminApiBundle/Resources/config/routing/zone.yml index 3da9d6273a..c83b0629b4 100644 --- a/src/Sylius/Bundle/ApiBundle/Resources/config/routing/zone.yml +++ b/src/Sylius/Bundle/AdminApiBundle/Resources/config/routing/zone.yml @@ -1,18 +1,18 @@ # This file is part of the Sylius package. # (c) Paweł Jędrzejewski -sylius_api_zone: +sylius_admin_api_zone: resource: | identifier: code alias: sylius.zone - section: api + section: admin_api except: ['create'] serialization_version: $version criteria: code: $code type: sylius.resource_api -sylius_api_zone_create: +sylius_admin_api_zone_create: path: /zones/{type} methods: [POST] defaults: diff --git a/src/Sylius/Bundle/ApiBundle/Resources/config/services.xml b/src/Sylius/Bundle/AdminApiBundle/Resources/config/services.xml similarity index 94% rename from src/Sylius/Bundle/ApiBundle/Resources/config/services.xml rename to src/Sylius/Bundle/AdminApiBundle/Resources/config/services.xml index 733b687c56..a71290e066 100644 --- a/src/Sylius/Bundle/ApiBundle/Resources/config/services.xml +++ b/src/Sylius/Bundle/AdminApiBundle/Resources/config/services.xml @@ -19,12 +19,12 @@ - + %fos_oauth_server.model.client.class% - + diff --git a/src/Sylius/Bundle/ApiBundle/Resources/config/services/controller.xml b/src/Sylius/Bundle/AdminApiBundle/Resources/config/services/controller.xml similarity index 84% rename from src/Sylius/Bundle/ApiBundle/Resources/config/services/controller.xml rename to src/Sylius/Bundle/AdminApiBundle/Resources/config/services/controller.xml index 9f30b5df60..4c21b10479 100644 --- a/src/Sylius/Bundle/ApiBundle/Resources/config/services/controller.xml +++ b/src/Sylius/Bundle/AdminApiBundle/Resources/config/services/controller.xml @@ -13,17 +13,17 @@ - + - + - + diff --git a/src/Sylius/Bundle/ApiBundle/Resources/config/services/fixture.xml b/src/Sylius/Bundle/AdminApiBundle/Resources/config/services/fixture.xml similarity index 91% rename from src/Sylius/Bundle/ApiBundle/Resources/config/services/fixture.xml rename to src/Sylius/Bundle/AdminApiBundle/Resources/config/services/fixture.xml index 2cb29ddb5c..b2f741acf0 100644 --- a/src/Sylius/Bundle/ApiBundle/Resources/config/services/fixture.xml +++ b/src/Sylius/Bundle/AdminApiBundle/Resources/config/services/fixture.xml @@ -13,13 +13,13 @@ - + - + diff --git a/src/Sylius/Bundle/ApiBundle/Resources/config/services/fixtures_factories.xml b/src/Sylius/Bundle/AdminApiBundle/Resources/config/services/fixtures_factories.xml similarity index 85% rename from src/Sylius/Bundle/ApiBundle/Resources/config/services/fixtures_factories.xml rename to src/Sylius/Bundle/AdminApiBundle/Resources/config/services/fixtures_factories.xml index 96c41baad4..a01a16d073 100644 --- a/src/Sylius/Bundle/ApiBundle/Resources/config/services/fixtures_factories.xml +++ b/src/Sylius/Bundle/AdminApiBundle/Resources/config/services/fixtures_factories.xml @@ -13,11 +13,11 @@ - + - + diff --git a/src/Sylius/Bundle/ApiBundle/Resources/config/services/form.xml b/src/Sylius/Bundle/AdminApiBundle/Resources/config/services/form.xml similarity index 85% rename from src/Sylius/Bundle/ApiBundle/Resources/config/services/form.xml rename to src/Sylius/Bundle/AdminApiBundle/Resources/config/services/form.xml index c2ede02727..d7284ef7ff 100644 --- a/src/Sylius/Bundle/ApiBundle/Resources/config/services/form.xml +++ b/src/Sylius/Bundle/AdminApiBundle/Resources/config/services/form.xml @@ -26,48 +26,48 @@ - + %sylius.model.api_client.class% %sylius.form.type.api_client.validation_groups% - + %sylius.model.order.class% %sylius.form.type.api_order.validation_groups% - + %sylius.model.order.class% %sylius.form.type.api_order.validation_groups% - + %sylius.model.customer.class% %sylius.form.type.api_customer.validation_groups% - + - + - + - + - + diff --git a/src/Sylius/Bundle/ApiBundle/Resources/meta/LICENSE b/src/Sylius/Bundle/AdminApiBundle/Resources/meta/LICENSE similarity index 100% rename from src/Sylius/Bundle/ApiBundle/Resources/meta/LICENSE rename to src/Sylius/Bundle/AdminApiBundle/Resources/meta/LICENSE diff --git a/src/Sylius/Bundle/ApiBundle/SyliusApiBundle.php b/src/Sylius/Bundle/AdminApiBundle/SyliusAdminApiBundle.php similarity index 80% rename from src/Sylius/Bundle/ApiBundle/SyliusApiBundle.php rename to src/Sylius/Bundle/AdminApiBundle/SyliusAdminApiBundle.php index 42ba81ef87..61aa3afecf 100644 --- a/src/Sylius/Bundle/ApiBundle/SyliusApiBundle.php +++ b/src/Sylius/Bundle/AdminApiBundle/SyliusAdminApiBundle.php @@ -9,7 +9,7 @@ * file that was distributed with this source code. */ -namespace Sylius\Bundle\ApiBundle; +namespace Sylius\Bundle\AdminApiBundle; use Sylius\Bundle\ResourceBundle\AbstractResourceBundle; use Sylius\Bundle\ResourceBundle\SyliusResourceBundle; @@ -17,7 +17,7 @@ use Sylius\Bundle\ResourceBundle\SyliusResourceBundle; /** * @author Paweł Jędrzejewski */ -final class SyliusApiBundle extends AbstractResourceBundle +final class SyliusAdminApiBundle extends AbstractResourceBundle { /** * {@inheritdoc} @@ -34,6 +34,6 @@ final class SyliusApiBundle extends AbstractResourceBundle */ protected function getModelNamespace() { - return 'Sylius\Bundle\ApiBundle\Model'; + return 'Sylius\Bundle\AdminApiBundle\Model'; } } diff --git a/src/Sylius/Bundle/ApiBundle/Tests/Fixture/ApiAccessTokenFixtureTest.php b/src/Sylius/Bundle/AdminApiBundle/Tests/Fixture/ApiAccessTokenFixtureTest.php similarity index 94% rename from src/Sylius/Bundle/ApiBundle/Tests/Fixture/ApiAccessTokenFixtureTest.php rename to src/Sylius/Bundle/AdminApiBundle/Tests/Fixture/ApiAccessTokenFixtureTest.php index dd1311c91f..43b0e1ba68 100644 --- a/src/Sylius/Bundle/ApiBundle/Tests/Fixture/ApiAccessTokenFixtureTest.php +++ b/src/Sylius/Bundle/AdminApiBundle/Tests/Fixture/ApiAccessTokenFixtureTest.php @@ -9,11 +9,11 @@ * file that was distributed with this source code. */ -namespace Sylius\Bundle\ApiBundle\Tests\Fixture; +namespace Sylius\Bundle\AdminApiBundle\Tests\Fixture; use Doctrine\Common\Persistence\ObjectManager; use Matthias\SymfonyConfigTest\PhpUnit\ConfigurationTestCaseTrait; -use Sylius\Bundle\ApiBundle\Fixture\ApiAccessTokenFixture; +use Sylius\Bundle\AdminApiBundle\Fixture\ApiAccessTokenFixture; use Sylius\Bundle\CoreBundle\Fixture\Factory\ExampleFactoryInterface; /** diff --git a/src/Sylius/Bundle/ApiBundle/Tests/Fixture/ApiCredentialsFixtureTest.php b/src/Sylius/Bundle/AdminApiBundle/Tests/Fixture/ApiCredentialsFixtureTest.php similarity index 94% rename from src/Sylius/Bundle/ApiBundle/Tests/Fixture/ApiCredentialsFixtureTest.php rename to src/Sylius/Bundle/AdminApiBundle/Tests/Fixture/ApiCredentialsFixtureTest.php index f96141dd59..43b52f2d4e 100644 --- a/src/Sylius/Bundle/ApiBundle/Tests/Fixture/ApiCredentialsFixtureTest.php +++ b/src/Sylius/Bundle/AdminApiBundle/Tests/Fixture/ApiCredentialsFixtureTest.php @@ -9,12 +9,12 @@ * file that was distributed with this source code. */ -namespace Sylius\Bundle\ApiBundle\Tests\Fixture; +namespace Sylius\Bundle\AdminApiBundle\Tests\Fixture; use Doctrine\Common\Persistence\ObjectManager; use Matthias\SymfonyConfigTest\PhpUnit\ConfigurationTestCaseTrait; use Sylius\Bundle\CoreBundle\Fixture\Factory\ExampleFactoryInterface; -use Sylius\Bundle\ApiBundle\Fixture\ApiClientFixture; +use Sylius\Bundle\AdminApiBundle\Fixture\ApiClientFixture; /** * @author Łukasz Chruściel diff --git a/src/Sylius/Bundle/ApiBundle/composer.json b/src/Sylius/Bundle/AdminApiBundle/composer.json similarity index 91% rename from src/Sylius/Bundle/ApiBundle/composer.json rename to src/Sylius/Bundle/AdminApiBundle/composer.json index b26691ac1a..d49bb0d96d 100644 --- a/src/Sylius/Bundle/ApiBundle/composer.json +++ b/src/Sylius/Bundle/AdminApiBundle/composer.json @@ -38,10 +38,10 @@ "bin-dir": "bin" }, "autoload": { - "psr-4": { "Sylius\\Bundle\\ApiBundle\\": "" } + "psr-4": { "Sylius\\Bundle\\AdminApiBundle\\": "" } }, "autoload-dev": { - "psr-4": { "Sylius\\Bundle\\ApiBundle\\spec\\": "spec/" } + "psr-4": { "Sylius\\Bundle\\AdminApiBundle\\spec\\": "spec/" } }, "minimum-stability": "dev", "prefer-stable": true, diff --git a/src/Sylius/Bundle/AdminApiBundle/phpspec.yml.dist b/src/Sylius/Bundle/AdminApiBundle/phpspec.yml.dist new file mode 100644 index 0000000000..ece89e5f27 --- /dev/null +++ b/src/Sylius/Bundle/AdminApiBundle/phpspec.yml.dist @@ -0,0 +1,5 @@ +suites: + main: + namespace: Sylius\Bundle\AdminApiBundle + psr4_prefix: Sylius\Bundle\AdminApiBundle + src_path: . diff --git a/src/Sylius/Bundle/ApiBundle/spec/Command/CreateClientCommandSpec.php b/src/Sylius/Bundle/AdminApiBundle/spec/Command/CreateClientCommandSpec.php similarity index 93% rename from src/Sylius/Bundle/ApiBundle/spec/Command/CreateClientCommandSpec.php rename to src/Sylius/Bundle/AdminApiBundle/spec/Command/CreateClientCommandSpec.php index 45901a4b26..e6425d5bbd 100644 --- a/src/Sylius/Bundle/ApiBundle/spec/Command/CreateClientCommandSpec.php +++ b/src/Sylius/Bundle/AdminApiBundle/spec/Command/CreateClientCommandSpec.php @@ -9,13 +9,13 @@ * file that was distributed with this source code. */ -namespace spec\Sylius\Bundle\ApiBundle\Command; +namespace spec\Sylius\Bundle\AdminApiBundle\Command; use FOS\OAuthServerBundle\Model\ClientManager; use PhpSpec\ObjectBehavior; use Prophecy\Argument; -use Sylius\Bundle\ApiBundle\Model\Client; -use Sylius\Bundle\ApiBundle\Command\CreateClientCommand; +use Sylius\Bundle\AdminApiBundle\Model\Client; +use Sylius\Bundle\AdminApiBundle\Command\CreateClientCommand; use Symfony\Bundle\FrameworkBundle\Command\ContainerAwareCommand; use Symfony\Component\Console\Input\InputInterface; use Symfony\Component\Console\Output\OutputInterface; diff --git a/src/Sylius/Bundle/ApiBundle/spec/EventListener/CartChangeListenerSpec.php b/src/Sylius/Bundle/AdminApiBundle/spec/EventListener/CartChangeListenerSpec.php similarity index 93% rename from src/Sylius/Bundle/ApiBundle/spec/EventListener/CartChangeListenerSpec.php rename to src/Sylius/Bundle/AdminApiBundle/spec/EventListener/CartChangeListenerSpec.php index 3f37829b09..569a1768e8 100644 --- a/src/Sylius/Bundle/ApiBundle/spec/EventListener/CartChangeListenerSpec.php +++ b/src/Sylius/Bundle/AdminApiBundle/spec/EventListener/CartChangeListenerSpec.php @@ -9,11 +9,11 @@ * file that was distributed with this source code. */ -namespace spec\Sylius\Bundle\ApiBundle\EventListener; +namespace spec\Sylius\Bundle\AdminApiBundle\EventListener; use Doctrine\Common\Persistence\ObjectManager; use PhpSpec\ObjectBehavior; -use Sylius\Bundle\ApiBundle\EventListener\CartChangeListener; +use Sylius\Bundle\AdminApiBundle\EventListener\CartChangeListener; use Sylius\Component\Core\Model\OrderInterface; use Sylius\Component\Core\Model\OrderItemInterface; use Sylius\Component\Order\Processor\OrderProcessorInterface; diff --git a/src/Sylius/Bundle/ApiBundle/spec/Form/EventSubscriber/AddUserFormSubscriberSpec.php b/src/Sylius/Bundle/AdminApiBundle/spec/Form/EventSubscriber/AddUserFormSubscriberSpec.php similarity index 96% rename from src/Sylius/Bundle/ApiBundle/spec/Form/EventSubscriber/AddUserFormSubscriberSpec.php rename to src/Sylius/Bundle/AdminApiBundle/spec/Form/EventSubscriber/AddUserFormSubscriberSpec.php index db134c7d30..095ed1788b 100644 --- a/src/Sylius/Bundle/ApiBundle/spec/Form/EventSubscriber/AddUserFormSubscriberSpec.php +++ b/src/Sylius/Bundle/AdminApiBundle/spec/Form/EventSubscriber/AddUserFormSubscriberSpec.php @@ -9,11 +9,11 @@ * file that was distributed with this source code. */ -namespace spec\Sylius\Bundle\ApiBundle\Form\EventSubscriber; +namespace spec\Sylius\Bundle\AdminApiBundle\Form\EventSubscriber; use PhpSpec\ObjectBehavior; use Prophecy\Argument; -use Sylius\Bundle\ApiBundle\Form\EventSubscriber\AddUserFormSubscriber; +use Sylius\Bundle\AdminApiBundle\Form\EventSubscriber\AddUserFormSubscriber; use Sylius\Component\User\Model\UserInterface; use Sylius\Component\User\Model\UserAwareInterface; use Symfony\Component\EventDispatcher\EventSubscriberInterface; diff --git a/src/Sylius/Bundle/ApiBundle/spec/Model/ClientManagerSpec.php b/src/Sylius/Bundle/AdminApiBundle/spec/Model/ClientManagerSpec.php similarity index 93% rename from src/Sylius/Bundle/ApiBundle/spec/Model/ClientManagerSpec.php rename to src/Sylius/Bundle/AdminApiBundle/spec/Model/ClientManagerSpec.php index e76b18b1d5..c1d7adae6c 100644 --- a/src/Sylius/Bundle/ApiBundle/spec/Model/ClientManagerSpec.php +++ b/src/Sylius/Bundle/AdminApiBundle/spec/Model/ClientManagerSpec.php @@ -9,7 +9,7 @@ * file that was distributed with this source code. */ -namespace spec\Sylius\Bundle\ApiBundle\Model; +namespace spec\Sylius\Bundle\AdminApiBundle\Model; use Doctrine\ORM\EntityManager; use Doctrine\ORM\EntityRepository; @@ -17,7 +17,7 @@ use FOS\OAuthServerBundle\Entity\ClientManager as FOSClientManager; use FOS\OAuthServerBundle\Model\ClientInterface; use FOS\OAuthServerBundle\Model\ClientManagerInterface; use PhpSpec\ObjectBehavior; -use Sylius\Bundle\ApiBundle\Model\ClientManager; +use Sylius\Bundle\AdminApiBundle\Model\ClientManager; final class ClientManagerSpec extends ObjectBehavior { diff --git a/src/Sylius/Bundle/ApiBundle/spec/Model/ClientSpec.php b/src/Sylius/Bundle/AdminApiBundle/spec/Model/ClientSpec.php similarity index 90% rename from src/Sylius/Bundle/ApiBundle/spec/Model/ClientSpec.php rename to src/Sylius/Bundle/AdminApiBundle/spec/Model/ClientSpec.php index 3e579859e8..76bbd0baf2 100644 --- a/src/Sylius/Bundle/ApiBundle/spec/Model/ClientSpec.php +++ b/src/Sylius/Bundle/AdminApiBundle/spec/Model/ClientSpec.php @@ -9,12 +9,12 @@ * file that was distributed with this source code. */ -namespace spec\Sylius\Bundle\ApiBundle\Model; +namespace spec\Sylius\Bundle\AdminApiBundle\Model; use FOS\OAuthServerBundle\Entity\Client as FOSClient; use FOS\OAuthServerBundle\Model\ClientInterface; use PhpSpec\ObjectBehavior; -use Sylius\Bundle\ApiBundle\Model\Client; +use Sylius\Bundle\AdminApiBundle\Model\Client; final class ClientSpec extends ObjectBehavior { diff --git a/src/Sylius/Bundle/ApiBundle/Resources/config/app/config.yml b/src/Sylius/Bundle/ApiBundle/Resources/config/app/config.yml deleted file mode 100644 index 938bbf77ba..0000000000 --- a/src/Sylius/Bundle/ApiBundle/Resources/config/app/config.yml +++ /dev/null @@ -1,19 +0,0 @@ -# This file is part of the Sylius package. -# (c) Paweł Jędrzejewski - -imports: - - { resource: "@SyliusApiBundle/Resources/config/app/fixtures.yml" } - - - { resource: "@SyliusApiBundle/Resources/config/grids/cart.yml" } - - { resource: "@SyliusApiBundle/Resources/config/grids/payments.yml" } - - { resource: "@SyliusApiBundle/Resources/config/grids/product.yml" } - - { resource: "@SyliusApiBundle/Resources/config/grids/product_variant.yml" } - - { resource: "@SyliusApiBundle/Resources/config/grids/promotion.yml" } - - { resource: "@SyliusApiBundle/Resources/config/grids/shipments.yml" } - - { resource: "@SyliusApiBundle/Resources/config/grids/taxon.yml" } - -sylius_api: - resources: - api_user: - classes: - model: "%sylius.model.admin_user.class%" diff --git a/src/Sylius/Bundle/ApiBundle/Resources/config/routing/main.yml b/src/Sylius/Bundle/ApiBundle/Resources/config/routing/main.yml deleted file mode 100644 index 6fbe713bb2..0000000000 --- a/src/Sylius/Bundle/ApiBundle/Resources/config/routing/main.yml +++ /dev/null @@ -1,96 +0,0 @@ -# This file is part of the Sylius package. -# (c) Paweł Jędrzejewski - -sylius_api_channel: - resource: "@SyliusApiBundle/Resources/config/routing/channel.yml" - -sylius_api_country: - resource: "@SyliusApiBundle/Resources/config/routing/country.yml" - -sylius_api_currency: - resource: "@SyliusApiBundle/Resources/config/routing/currency.yml" - -sylius_api_locale: - resource: "@SyliusApiBundle/Resources/config/routing/locale.yml" - -sylius_api_product: - resource: "@SyliusApiBundle/Resources/config/routing/product.yml" - -sylius_api_product_attribute: - resource: "@SyliusApiBundle/Resources/config/routing/product_attribute.yml" - -sylius_api_product_option: - resource: "@SyliusApiBundle/Resources/config/routing/product_option.yml" - -sylius_api_product_variant: - resource: "@SyliusApiBundle/Resources/config/routing/product_variant.yml" - prefix: /products/{productCode} - -sylius_api_promotion: - resource: "@SyliusApiBundle/Resources/config/routing/promotion.yml" - -sylius_api_promotion_coupon: - resource: "@SyliusApiBundle/Resources/config/routing/promotion_coupon.yml" - prefix: /promotions/{promotionCode}/coupons - -sylius_api_taxon: - resource: "@SyliusApiBundle/Resources/config/routing/taxon.yml" - -sylius_api_product_taxon_position: - resource: "@SyliusApiBundle/Resources/config/routing/product_taxon_position.yml" - -sylius_api_cart: - resource: "@SyliusApiBundle/Resources/config/routing/cart.yml" - prefix: /carts - -sylius_api_adjustment: - resource: "@SyliusApiBundle/Resources/config/routing/adjustment.yml" - prefix: /orders/{orderId}/adjustments - -sylius_api_cart_item: - resource: "@SyliusApiBundle/Resources/config/routing/cart_item.yml" - prefix: /carts/{cartId} - -sylius_api_order: - resource: "@SyliusApiBundle/Resources/config/routing/order.yml" - -sylius_api_checkout: - resource: "@SyliusApiBundle/Resources/config/routing/checkout.yml" - prefix: /checkouts - -sylius_api_tax_category: - resource: "@SyliusApiBundle/Resources/config/routing/tax_category.yml" - -sylius_api_tax_rate: - resource: "@SyliusApiBundle/Resources/config/routing/tax_rate.yml" - -sylius_api_shipping_category: - resource: "@SyliusApiBundle/Resources/config/routing/shipping_category.yml" - -sylius_api_shipping_method: - resource: "@SyliusApiBundle/Resources/config/routing/shipping_method.yml" - -sylius_api_shipment: - resource: "@SyliusApiBundle/Resources/config/routing/shipment.yml" - -sylius_api_payment_method: - resource: "@SyliusApiBundle/Resources/config/routing/payment_method.yml" - -sylius_api_payment: - resource: "@SyliusApiBundle/Resources/config/routing/payment.yml" - -sylius_api_exchange_rate: - resource: "@SyliusApiBundle/Resources/config/routing/exchange_rate.yml" - -sylius_api_province: - resource: "@SyliusApiBundle/Resources/config/routing/province.yml" - prefix: /countries/{countryCode}/provinces - -sylius_api_zone: - resource: "@SyliusApiBundle/Resources/config/routing/zone.yml" - -sylius_api_customer: - resource: "@SyliusApiBundle/Resources/config/routing/customer.yml" - prefix: /customers - - diff --git a/src/Sylius/Bundle/ApiBundle/phpspec.yml.dist b/src/Sylius/Bundle/ApiBundle/phpspec.yml.dist deleted file mode 100644 index 263cfdff2e..0000000000 --- a/src/Sylius/Bundle/ApiBundle/phpspec.yml.dist +++ /dev/null @@ -1,5 +0,0 @@ -suites: - main: - namespace: Sylius\Bundle\ApiBundle - psr4_prefix: Sylius\Bundle\ApiBundle - src_path: . diff --git a/src/Sylius/Bundle/ChannelBundle/Resources/config/serializer/Model.Channel.yml b/src/Sylius/Bundle/ChannelBundle/Resources/config/serializer/Model.Channel.yml index 2ea3c97604..36a79ae3b1 100644 --- a/src/Sylius/Bundle/ChannelBundle/Resources/config/serializer/Model.Channel.yml +++ b/src/Sylius/Bundle/ChannelBundle/Resources/config/serializer/Model.Channel.yml @@ -42,7 +42,7 @@ Sylius\Component\Channel\Model\Channel: relations: - rel: self href: - route: sylius_api_channel_show + route: sylius_admin_api_channel_show parameters: code: expr(object.getCode()) version: 1 diff --git a/src/Sylius/Bundle/CoreBundle/Collector/SyliusCollector.php b/src/Sylius/Bundle/CoreBundle/Collector/SyliusCollector.php index f807e8eeaf..23d88f275d 100644 --- a/src/Sylius/Bundle/CoreBundle/Collector/SyliusCollector.php +++ b/src/Sylius/Bundle/CoreBundle/Collector/SyliusCollector.php @@ -50,7 +50,7 @@ final class SyliusCollector extends DataCollector 'default_locale_code' => $defaultLocaleCode, 'locale_code' => null, 'extensions' => [ - 'SyliusApiBundle' => ['name' => 'API', 'enabled' => false], + 'SyliusAdminApiBundle' => ['name' => 'API', 'enabled' => false], 'SyliusAdminBundle' => ['name' => 'Admin', 'enabled' => false], 'SyliusShopBundle' => ['name' => 'Shop', 'enabled' => false], ], diff --git a/src/Sylius/Bundle/CoreBundle/Resources/config/serializer/Model.OrderItem.yml b/src/Sylius/Bundle/CoreBundle/Resources/config/serializer/Model.OrderItem.yml index d531149c5b..e027ec0ab5 100644 --- a/src/Sylius/Bundle/CoreBundle/Resources/config/serializer/Model.OrderItem.yml +++ b/src/Sylius/Bundle/CoreBundle/Resources/config/serializer/Model.OrderItem.yml @@ -11,7 +11,7 @@ Sylius\Component\Core\Model\OrderItem: exclude_if: expr(!object.getVariant()) groups: [Default, Detailed, DetailedCart] href: - route: sylius_api_product_show + route: sylius_admin_api_product_show parameters: code: expr(object.getVariant().getProduct().getCode()) version: 1 @@ -20,7 +20,7 @@ Sylius\Component\Core\Model\OrderItem: exclude_if: expr(!object.getVariant()) groups: [Default, Detailed, DetailedCart] href: - route: sylius_api_product_variant_show + route: sylius_admin_api_product_variant_show parameters: code: expr(object.getVariant().getCode()) productCode: expr(object.getVariant().getProduct().getCode()) diff --git a/src/Sylius/Bundle/CoreBundle/Resources/config/serializer/Model.Payment.yml b/src/Sylius/Bundle/CoreBundle/Resources/config/serializer/Model.Payment.yml index caf80c0cdb..3bae95c742 100644 --- a/src/Sylius/Bundle/CoreBundle/Resources/config/serializer/Model.Payment.yml +++ b/src/Sylius/Bundle/CoreBundle/Resources/config/serializer/Model.Payment.yml @@ -6,7 +6,7 @@ Sylius\Component\Core\Model\Payment: exclusion: exclude_if: expr(!object.getOrder()) href: - route: sylius_api_order_show + route: sylius_admin_api_order_show parameters: id: expr(object.getOrder().getId()) version: 1 diff --git a/src/Sylius/Bundle/CoreBundle/Resources/config/serializer/Model.Shipment.yml b/src/Sylius/Bundle/CoreBundle/Resources/config/serializer/Model.Shipment.yml index dc262a7d67..518753146e 100644 --- a/src/Sylius/Bundle/CoreBundle/Resources/config/serializer/Model.Shipment.yml +++ b/src/Sylius/Bundle/CoreBundle/Resources/config/serializer/Model.Shipment.yml @@ -6,7 +6,7 @@ Sylius\Component\Core\Model\Shipment: exclusion: exclude_if: expr(!object.getOrder()) href: - route: sylius_api_order_show + route: sylius_admin_api_order_show parameters: id: expr(object.getOrder().getId()) version: 1 diff --git a/src/Sylius/Bundle/CoreBundle/Resources/config/serializer/Model.ShippingMethod.yml b/src/Sylius/Bundle/CoreBundle/Resources/config/serializer/Model.ShippingMethod.yml index bfa86fb52a..91ad6ec597 100644 --- a/src/Sylius/Bundle/CoreBundle/Resources/config/serializer/Model.ShippingMethod.yml +++ b/src/Sylius/Bundle/CoreBundle/Resources/config/serializer/Model.ShippingMethod.yml @@ -4,7 +4,7 @@ Sylius\Component\Core\Model\ShippingMethod: relations: - rel: zone href: - route: sylius_api_zone_show + route: sylius_admin_api_zone_show parameters: code: expr(object.getZone().getCode()) version: 1 diff --git a/src/Sylius/Bundle/CoreBundle/Resources/config/serializer/Model.TaxRate.yml b/src/Sylius/Bundle/CoreBundle/Resources/config/serializer/Model.TaxRate.yml index a46cf13fb3..d486a63cc5 100644 --- a/src/Sylius/Bundle/CoreBundle/Resources/config/serializer/Model.TaxRate.yml +++ b/src/Sylius/Bundle/CoreBundle/Resources/config/serializer/Model.TaxRate.yml @@ -7,7 +7,7 @@ Sylius\Component\Core\Model\TaxRate: relations: - rel: zone href: - route: sylius_api_zone_show + route: sylius_admin_api_zone_show parameters: code: expr(object.getZone().getCode()) version: 1 diff --git a/src/Sylius/Bundle/CurrencyBundle/Resources/config/serializer/Model.Currency.yml b/src/Sylius/Bundle/CurrencyBundle/Resources/config/serializer/Model.Currency.yml index c22fb1c79d..80cfedea8c 100644 --- a/src/Sylius/Bundle/CurrencyBundle/Resources/config/serializer/Model.Currency.yml +++ b/src/Sylius/Bundle/CurrencyBundle/Resources/config/serializer/Model.Currency.yml @@ -22,7 +22,7 @@ Sylius\Component\Currency\Model\Currency: relations: - rel: self href: - route: sylius_api_currency_show + route: sylius_admin_api_currency_show parameters: code: expr(object.getCode()) version: 1 diff --git a/src/Sylius/Bundle/CurrencyBundle/Resources/config/serializer/Model.ExchangeRate.yml b/src/Sylius/Bundle/CurrencyBundle/Resources/config/serializer/Model.ExchangeRate.yml index 49ebe93617..728522932e 100644 --- a/src/Sylius/Bundle/CurrencyBundle/Resources/config/serializer/Model.ExchangeRate.yml +++ b/src/Sylius/Bundle/CurrencyBundle/Resources/config/serializer/Model.ExchangeRate.yml @@ -22,7 +22,7 @@ Sylius\Component\Currency\Model\ExchangeRate: relations: - rel: self href: - route: sylius_api_exchange_rate_show + route: sylius_admin_api_exchange_rate_show parameters: sourceCurrencyCode: expr(object.getSourceCurrency().getCode()) targetCurrencyCode: expr(object.getTargetCurrency().getCode()) diff --git a/src/Sylius/Bundle/CustomerBundle/Resources/config/serializer/Model.Customer.yml b/src/Sylius/Bundle/CustomerBundle/Resources/config/serializer/Model.Customer.yml index 3c4c74d7b9..6b30be723e 100644 --- a/src/Sylius/Bundle/CustomerBundle/Resources/config/serializer/Model.Customer.yml +++ b/src/Sylius/Bundle/CustomerBundle/Resources/config/serializer/Model.Customer.yml @@ -37,7 +37,7 @@ Sylius\Component\Customer\Model\Customer: relations: - rel: self href: - route: sylius_api_customer_show + route: sylius_admin_api_customer_show parameters: id: expr(object.getId()) version: 1 diff --git a/src/Sylius/Bundle/LocaleBundle/Resources/config/serializer/Model.Locale.yml b/src/Sylius/Bundle/LocaleBundle/Resources/config/serializer/Model.Locale.yml index 3dcac1b24c..73b8c15ec2 100644 --- a/src/Sylius/Bundle/LocaleBundle/Resources/config/serializer/Model.Locale.yml +++ b/src/Sylius/Bundle/LocaleBundle/Resources/config/serializer/Model.Locale.yml @@ -22,7 +22,7 @@ Sylius\Component\Locale\Model\Locale: relations: - rel: self href: - route: sylius_api_locale_show + route: sylius_admin_api_locale_show parameters: code: expr(object.getCode()) version: 1 diff --git a/src/Sylius/Bundle/OrderBundle/Resources/config/serializer/Model.OrderItem.yml b/src/Sylius/Bundle/OrderBundle/Resources/config/serializer/Model.OrderItem.yml index c01a0e25a1..75986fea76 100644 --- a/src/Sylius/Bundle/OrderBundle/Resources/config/serializer/Model.OrderItem.yml +++ b/src/Sylius/Bundle/OrderBundle/Resources/config/serializer/Model.OrderItem.yml @@ -39,7 +39,7 @@ Sylius\Component\Order\Model\OrderItem: exclusion: groups: [Default, Detailed, DetailedCart] href: - route: sylius_api_order_show + route: sylius_admin_api_order_show parameters: id: expr(object.getOrder().getId()) version: 1 diff --git a/src/Sylius/Bundle/PaymentBundle/Resources/config/serializer/Model.Payment.yml b/src/Sylius/Bundle/PaymentBundle/Resources/config/serializer/Model.Payment.yml index 4be72ae246..34a80458c3 100644 --- a/src/Sylius/Bundle/PaymentBundle/Resources/config/serializer/Model.Payment.yml +++ b/src/Sylius/Bundle/PaymentBundle/Resources/config/serializer/Model.Payment.yml @@ -27,7 +27,7 @@ Sylius\Component\Payment\Model\Payment: exclusion: exclude_if: expr(!object.getId()) href: - route: sylius_api_payment_show + route: sylius_admin_api_payment_show parameters: id: expr(object.getId()) version: 1 @@ -35,7 +35,7 @@ Sylius\Component\Payment\Model\Payment: exclusion: exclude_if: expr(!object.getMethod()) href: - route: sylius_api_payment_method_show + route: sylius_admin_api_payment_method_show parameters: code: expr(object.getMethod().getCode()) version: 1 diff --git a/src/Sylius/Bundle/PaymentBundle/Resources/config/serializer/Model.PaymentMethod.yml b/src/Sylius/Bundle/PaymentBundle/Resources/config/serializer/Model.PaymentMethod.yml index 9e77a725ba..b8703397b1 100644 --- a/src/Sylius/Bundle/PaymentBundle/Resources/config/serializer/Model.PaymentMethod.yml +++ b/src/Sylius/Bundle/PaymentBundle/Resources/config/serializer/Model.PaymentMethod.yml @@ -34,7 +34,7 @@ Sylius\Component\Payment\Model\PaymentMethod: relations: - rel: self href: - route: sylius_api_payment_method_show + route: sylius_admin_api_payment_method_show parameters: code: expr(object.getCode()) version: 1 diff --git a/src/Sylius/Bundle/ProductBundle/Resources/config/serializer/Model.Product.yml b/src/Sylius/Bundle/ProductBundle/Resources/config/serializer/Model.Product.yml index a6e6174c6d..cd41130d77 100644 --- a/src/Sylius/Bundle/ProductBundle/Resources/config/serializer/Model.Product.yml +++ b/src/Sylius/Bundle/ProductBundle/Resources/config/serializer/Model.Product.yml @@ -33,13 +33,13 @@ Sylius\Component\Product\Model\Product: relations: - rel: self href: - route: sylius_api_product_show + route: sylius_admin_api_product_show parameters: code: expr(object.getCode()) version: 1 - rel: variants href: - route: sylius_api_product_variant_index + route: sylius_admin_api_product_variant_index parameters: productCode: expr(object.getCode()) version: 1 diff --git a/src/Sylius/Bundle/ProductBundle/Resources/config/serializer/Model.ProductAttribute.yml b/src/Sylius/Bundle/ProductBundle/Resources/config/serializer/Model.ProductAttribute.yml index d02e64a480..f8790d0895 100644 --- a/src/Sylius/Bundle/ProductBundle/Resources/config/serializer/Model.ProductAttribute.yml +++ b/src/Sylius/Bundle/ProductBundle/Resources/config/serializer/Model.ProductAttribute.yml @@ -10,7 +10,7 @@ Sylius\Component\Product\Model\ProductAttribute: relations: - rel: self href: - route: sylius_api_product_attribute_show + route: sylius_admin_api_product_attribute_show parameters: code: expr(object.getCode()) version: 1 diff --git a/src/Sylius/Bundle/ProductBundle/Resources/config/serializer/Model.ProductOption.yml b/src/Sylius/Bundle/ProductBundle/Resources/config/serializer/Model.ProductOption.yml index bd0a5264b5..d683e2f8c8 100644 --- a/src/Sylius/Bundle/ProductBundle/Resources/config/serializer/Model.ProductOption.yml +++ b/src/Sylius/Bundle/ProductBundle/Resources/config/serializer/Model.ProductOption.yml @@ -22,7 +22,7 @@ Sylius\Component\Product\Model\ProductOption: relations: - rel: self href: - route: sylius_api_product_show + route: sylius_admin_api_product_show parameters: code: expr(object.getCode()) version: 1 diff --git a/src/Sylius/Bundle/ProductBundle/Resources/config/serializer/Model.ProductVariant.yml b/src/Sylius/Bundle/ProductBundle/Resources/config/serializer/Model.ProductVariant.yml index 65b838a940..882968ee3d 100644 --- a/src/Sylius/Bundle/ProductBundle/Resources/config/serializer/Model.ProductVariant.yml +++ b/src/Sylius/Bundle/ProductBundle/Resources/config/serializer/Model.ProductVariant.yml @@ -26,14 +26,14 @@ Sylius\Component\Product\Model\ProductVariant: relations: - rel: self href: - route: sylius_api_product_variant_show + route: sylius_admin_api_product_variant_show parameters: code: expr(object.getCode()) productCode: expr(object.getProduct().getCode()) version: 1 - rel: product href: - route: sylius_api_product_show + route: sylius_admin_api_product_show parameters: code: expr(object.getProduct().getCode()) version: 1 diff --git a/src/Sylius/Bundle/PromotionBundle/Resources/config/serializer/Model.Promotion.yml b/src/Sylius/Bundle/PromotionBundle/Resources/config/serializer/Model.Promotion.yml index 351cd81de5..a4896fa611 100644 --- a/src/Sylius/Bundle/PromotionBundle/Resources/config/serializer/Model.Promotion.yml +++ b/src/Sylius/Bundle/PromotionBundle/Resources/config/serializer/Model.Promotion.yml @@ -62,13 +62,13 @@ Sylius\Component\Promotion\Model\Promotion: relations: - rel: self href: - route: sylius_api_promotion_show + route: sylius_admin_api_promotion_show parameters: code: expr(object.getCode()) version: 1 - rel: coupons href: - route: sylius_api_promotion_coupon_index + route: sylius_admin_api_promotion_coupon_index parameters: promotionCode: expr(object.getCode()) version: 1 diff --git a/src/Sylius/Bundle/PromotionBundle/Resources/config/serializer/Model.PromotionCoupon.yml b/src/Sylius/Bundle/PromotionBundle/Resources/config/serializer/Model.PromotionCoupon.yml index c4fd92bf9d..a5a3649da3 100644 --- a/src/Sylius/Bundle/PromotionBundle/Resources/config/serializer/Model.PromotionCoupon.yml +++ b/src/Sylius/Bundle/PromotionBundle/Resources/config/serializer/Model.PromotionCoupon.yml @@ -34,14 +34,14 @@ Sylius\Component\Promotion\Model\PromotionCoupon: relations: - rel: self href: - route: sylius_api_promotion_coupon_show + route: sylius_admin_api_promotion_coupon_show parameters: promotionCode: expr(object.getPromotion().getCode()) code: expr(object.getCode()) version: 1 - rel: promotion href: - route: sylius_api_promotion_show + route: sylius_admin_api_promotion_show parameters: code: expr(object.getPromotion().getCode()) version: 1 diff --git a/src/Sylius/Bundle/ShippingBundle/Resources/config/serializer/Model.Shipment.yml b/src/Sylius/Bundle/ShippingBundle/Resources/config/serializer/Model.Shipment.yml index ccb98b9c11..47c5b5da86 100644 --- a/src/Sylius/Bundle/ShippingBundle/Resources/config/serializer/Model.Shipment.yml +++ b/src/Sylius/Bundle/ShippingBundle/Resources/config/serializer/Model.Shipment.yml @@ -22,7 +22,7 @@ Sylius\Component\Shipping\Model\Shipment: exclusion: exclude_if: expr(!object.getId()) href: - route: sylius_api_shipment_show + route: sylius_admin_api_shipment_show parameters: id: expr(object.getId()) version: 1 @@ -30,7 +30,7 @@ Sylius\Component\Shipping\Model\Shipment: exclusion: exclude_if: expr(!object.getMethod()) href: - route: sylius_api_shipping_method_show + route: sylius_admin_api_shipping_method_show parameters: code: expr(object.getMethod().getCode()) version: 1 diff --git a/src/Sylius/Bundle/ShippingBundle/Resources/config/serializer/Model.ShipmentUnit.yml b/src/Sylius/Bundle/ShippingBundle/Resources/config/serializer/Model.ShipmentUnit.yml index 4c40271c45..2f1779f3df 100644 --- a/src/Sylius/Bundle/ShippingBundle/Resources/config/serializer/Model.ShipmentUnit.yml +++ b/src/Sylius/Bundle/ShippingBundle/Resources/config/serializer/Model.ShipmentUnit.yml @@ -18,14 +18,14 @@ Sylius\Component\Shipping\Model\ShipmentUnit: relations: - rel: self href: - route: sylius_api_shipment_unit_show + route: sylius_admin_api_shipment_unit_show parameters: shipmentId: expr(object.getShipment().getId()) id: expr(object.getId()) version: 1 - rel: shipment href: - route: sylius_api_shipment_show + route: sylius_admin_api_shipment_show parameters: id: expr(object.getShipment().getId()) version: 1 diff --git a/src/Sylius/Bundle/ShippingBundle/Resources/config/serializer/Model.ShippingCategory.yml b/src/Sylius/Bundle/ShippingBundle/Resources/config/serializer/Model.ShippingCategory.yml index 163954a9ed..e4b40f6e09 100644 --- a/src/Sylius/Bundle/ShippingBundle/Resources/config/serializer/Model.ShippingCategory.yml +++ b/src/Sylius/Bundle/ShippingBundle/Resources/config/serializer/Model.ShippingCategory.yml @@ -30,7 +30,7 @@ Sylius\Component\Shipping\Model\ShippingCategory: relations: - rel: self href: - route: sylius_api_shipping_category_show + route: sylius_admin_api_shipping_category_show parameters: code: expr(object.getCode()) version: 1 diff --git a/src/Sylius/Bundle/ShippingBundle/Resources/config/serializer/Model.ShippingMethod.yml b/src/Sylius/Bundle/ShippingBundle/Resources/config/serializer/Model.ShippingMethod.yml index 188681653b..9407a3bb0b 100644 --- a/src/Sylius/Bundle/ShippingBundle/Resources/config/serializer/Model.ShippingMethod.yml +++ b/src/Sylius/Bundle/ShippingBundle/Resources/config/serializer/Model.ShippingMethod.yml @@ -21,7 +21,7 @@ Sylius\Component\Shipping\Model\ShippingMethod: relations: - rel: self href: - route: sylius_api_shipping_method_show + route: sylius_admin_api_shipping_method_show parameters: code: expr(object.getCode()) version: 1 diff --git a/src/Sylius/Bundle/TaxationBundle/Resources/config/serializer/Model.TaxCategory.yml b/src/Sylius/Bundle/TaxationBundle/Resources/config/serializer/Model.TaxCategory.yml index c551499df9..5f2b18ae20 100644 --- a/src/Sylius/Bundle/TaxationBundle/Resources/config/serializer/Model.TaxCategory.yml +++ b/src/Sylius/Bundle/TaxationBundle/Resources/config/serializer/Model.TaxCategory.yml @@ -30,7 +30,7 @@ Sylius\Component\Taxation\Model\TaxCategory: relations: - rel: self href: - route: sylius_api_tax_category_show + route: sylius_admin_api_tax_category_show parameters: code: expr(object.getCode()) version: 1 diff --git a/src/Sylius/Bundle/TaxationBundle/Resources/config/serializer/Model.TaxRate.yml b/src/Sylius/Bundle/TaxationBundle/Resources/config/serializer/Model.TaxRate.yml index ab02124e88..54c80df372 100644 --- a/src/Sylius/Bundle/TaxationBundle/Resources/config/serializer/Model.TaxRate.yml +++ b/src/Sylius/Bundle/TaxationBundle/Resources/config/serializer/Model.TaxRate.yml @@ -31,13 +31,13 @@ Sylius\Component\Taxation\Model\TaxRate: relations: - rel: self href: - route: sylius_api_tax_rate_show + route: sylius_admin_api_tax_rate_show parameters: code: expr(object.getCode()) version: 1 - rel: category href: - route: sylius_api_tax_category_show + route: sylius_admin_api_tax_category_show parameters: code: expr(object.getCategory().getCode()) version: 1 diff --git a/src/Sylius/Bundle/TaxationBundle/Tests/Functional/app/config/parameters.yml b/src/Sylius/Bundle/TaxationBundle/Tests/Functional/app/config/parameters.yml new file mode 100644 index 0000000000..adec199e19 --- /dev/null +++ b/src/Sylius/Bundle/TaxationBundle/Tests/Functional/app/config/parameters.yml @@ -0,0 +1,9 @@ +# This file is auto-generated during the composer install +parameters: + database_driver: pdo_mysql + database_host: 127.0.0.1 + database_port: null + database_name: sylius_taxation_test + database_user: root + database_password: null + database_version: 5.5 diff --git a/src/Sylius/Bundle/TaxonomyBundle/Resources/config/serializer/Model.Taxon.yml b/src/Sylius/Bundle/TaxonomyBundle/Resources/config/serializer/Model.Taxon.yml index 6b9699e1fe..9cecc58bfe 100644 --- a/src/Sylius/Bundle/TaxonomyBundle/Resources/config/serializer/Model.Taxon.yml +++ b/src/Sylius/Bundle/TaxonomyBundle/Resources/config/serializer/Model.Taxon.yml @@ -53,7 +53,7 @@ Sylius\Component\Taxonomy\Model\Taxon: relations: - rel: self href: - route: sylius_api_taxon_show + route: sylius_admin_api_taxon_show parameters: code: expr(object.getCode()) version: 1 diff --git a/tests/Controller/ProductVariantApiTest.php b/tests/Controller/ProductVariantApiTest.php index 1408d6a36a..533d24ca49 100644 --- a/tests/Controller/ProductVariantApiTest.php +++ b/tests/Controller/ProductVariantApiTest.php @@ -12,7 +12,7 @@ namespace Sylius\Tests\Controller; use Lakion\ApiTestCase\JsonApiTestCase; -use Sylius\Bundle\ApiBundle\Form\Type\ProductVariantType; +use Sylius\Bundle\AdminApiBundle\Form\Type\ProductVariantType; use Sylius\Component\Core\Model\ProductInterface; use Sylius\Component\Core\Model\ProductVariantInterface; use Symfony\Component\HttpFoundation\Response; @@ -29,7 +29,7 @@ final class ProductVariantApiTest extends JsonApiTestCase 'HTTP_Authorization' => 'Bearer SampleTokenNjZkNjY2MDEwMTAzMDkxMGE0OTlhYzU3NzYyMTE0ZGQ3ODcyMDAwM2EwMDZjNDI5NDlhMDdlMQ', 'CONTENT_TYPE' => 'application/json', ]; - + /** * @var array */ @@ -37,7 +37,7 @@ final class ProductVariantApiTest extends JsonApiTestCase 'HTTP_Authorization' => 'Bearer SampleTokenNjZkNjY2MDEwMTAzMDkxMGE0OTlhYzU3NzYyMTE0ZGQ3ODcyMDAwM2EwMDZjNDI5NDlhMDdlMQ', 'ACCEPT' => 'application/json', ]; - + /** * @test */ @@ -138,7 +138,7 @@ final class ProductVariantApiTest extends JsonApiTestCase $this->client->request('GET', $this->getVariantListUrl($product), ['sorting' => ['position' => 'desc']], [], static::$authorizedHeaderWithAccept); $response = $this->client->getResponse(); - + $this->assertResponse($response, 'product_variant/sorted_index_response'); } @@ -354,7 +354,7 @@ EOT; $this->assertResponse($response, 'product_variant/create_with_product_option_response', Response::HTTP_CREATED); } - + /** * @test */ diff --git a/tests/DataFixtures/ORM/authentication/api_administrator.yml b/tests/DataFixtures/ORM/authentication/api_administrator.yml index 796f6b5b86..fe71204cf0 100644 --- a/tests/DataFixtures/ORM/authentication/api_administrator.yml +++ b/tests/DataFixtures/ORM/authentication/api_administrator.yml @@ -1,16 +1,16 @@ -Sylius\Bundle\ApiBundle\Model\Client: +Sylius\Bundle\AdminApiBundle\Model\Client: oauth: randomId: client_id secret: secret allowedGrantTypes: [password, access_token, refresh_token] -Sylius\Bundle\ApiBundle\Model\AccessToken: +Sylius\Bundle\AdminApiBundle\Model\AccessToken: oauth_access_token: client: "@oauth" user: "@admin" token: SampleTokenNjZkNjY2MDEwMTAzMDkxMGE0OTlhYzU3NzYyMTE0ZGQ3ODcyMDAwM2EwMDZjNDI5NDlhMDdlMQ -Sylius\Bundle\ApiBundle\Model\RefreshToken: +Sylius\Bundle\AdminApiBundle\Model\RefreshToken: oauth_refresh_token: client: "@oauth" user: "@admin"