Skip to content

Commit

Permalink
Merge pull request #846 from dpfaffenbauer/fix-autoloader-paths
Browse files Browse the repository at this point in the history
Fix autoloader paths -> wrong directory for namespace
  • Loading branch information
dpfaffenbauer authored Feb 27, 2019
2 parents d8e2722 + 8aa5359 commit 4e46b27
Show file tree
Hide file tree
Showing 55 changed files with 42 additions and 42 deletions.
2 changes: 1 addition & 1 deletion src/CoreShop/Behat/Model/Index/TestEnableIndex.php
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
namespace CoreShop\Behat\Model\Index;

use CoreShop\Component\Index\Model\IndexableInterface;
use CoreShop\Component\Resource\ImplementedByPimcoreException;
use CoreShop\Component\Resource\Exception\ImplementedByPimcoreException;
use CoreShop\Component\Resource\Pimcore\Model\AbstractPimcoreModel;

class TestEnableIndex extends AbstractPimcoreModel implements IndexableInterface
Expand Down
2 changes: 1 addition & 1 deletion src/CoreShop/Behat/Model/Index/TestIndex.php
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
namespace CoreShop\Behat\Model\Index;

use CoreShop\Component\Index\Model\IndexableInterface;
use CoreShop\Component\Resource\ImplementedByPimcoreException;
use CoreShop\Component\Resource\Exception\ImplementedByPimcoreException;
use CoreShop\Component\Resource\Pimcore\Model\AbstractPimcoreModel;

class TestIndex extends AbstractPimcoreModel implements IndexableInterface
Expand Down
2 changes: 1 addition & 1 deletion src/CoreShop/Behat/Model/Index/TestIndexFields.php
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
namespace CoreShop\Behat\Model\Index;

use CoreShop\Component\Index\Model\IndexableInterface;
use CoreShop\Component\Resource\ImplementedByPimcoreException;
use CoreShop\Component\Resource\Exception\ImplementedByPimcoreException;
use CoreShop\Component\Resource\Pimcore\Model\AbstractPimcoreModel;

class TestIndexFields extends AbstractPimcoreModel implements IndexableInterface
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
* @license https://www.coreshop.org/license GNU General Public License version 3 (GPLv3)
*/

namespace CoreShop\Bundle\CoreBundle\Fixtures\Application;
namespace CoreShop\Bundle\CoreBundle\Fixtures\Data\Application;

use CoreShop\Bundle\FixtureBundle\Fixture\VersionedFixtureInterface;
use Doctrine\Common\DataFixtures\AbstractFixture;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
* @license https://www.coreshop.org/license GNU General Public License version 3 (GPLv3)
*/

namespace CoreShop\Bundle\CoreBundle\Fixtures\Application;
namespace CoreShop\Bundle\CoreBundle\Fixtures\Data\Application;

use CoreShop\Bundle\FixtureBundle\Fixture\VersionedFixtureInterface;
use CoreShop\Component\Core\Model\CountryInterface;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
* @license https://www.coreshop.org/license GNU General Public License version 3 (GPLv3)
*/

namespace CoreShop\Bundle\CoreBundle\Fixtures\Application;
namespace CoreShop\Bundle\CoreBundle\Fixtures\Data\Application;

use CoreShop\Bundle\FixtureBundle\Fixture\VersionedFixtureInterface;
use CoreShop\Component\Core\Model\CurrencyInterface;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
* @license https://www.coreshop.org/license GNU General Public License version 3 (GPLv3)
*/

namespace CoreShop\Bundle\CoreBundle\Fixtures\Application;
namespace CoreShop\Bundle\CoreBundle\Fixtures\Data\Application;

use CoreShop\Bundle\FixtureBundle\Fixture\VersionedFixtureInterface;
use CoreShop\Bundle\NotificationBundle\Form\Type\NotificationRuleType;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
* @license https://www.coreshop.org/license GNU General Public License version 3 (GPLv3)
*/

namespace CoreShop\Bundle\CoreBundle\Fixtures\Application;
namespace CoreShop\Bundle\CoreBundle\Fixtures\Data\Application;

use CoreShop\Bundle\FixtureBundle\Fixture\VersionedFixtureInterface;
use CoreShop\Component\Core\Model\StoreInterface;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
* @license https://www.coreshop.org/license GNU General Public License version 3 (GPLv3)
*/

namespace CoreShop\Bundle\CoreBundle\Fixtures\Application;
namespace CoreShop\Bundle\CoreBundle\Fixtures\Data\Application;

use CoreShop\Bundle\FixtureBundle\Fixture\VersionedFixtureInterface;
use CoreShop\Component\Address\Model\ZoneInterface;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
* @license https://www.coreshop.org/license GNU General Public License version 3 (GPLv3)
*/

namespace CoreShop\Bundle\ResourceBundle\Validation\Constraints;
namespace CoreShop\Bundle\ResourceBundle\Validator\Constraints;

use Symfony\Component\Validator\Constraint;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
* @license https://www.coreshop.org/license GNU General Public License version 3 (GPLv3)
*/

namespace CoreShop\Bundle\ResourceBundle\Validation\Constraints;
namespace CoreShop\Bundle\ResourceBundle\Validator\Constraints;

use CoreShop\Component\Resource\Model\ToggleableInterface;
use Symfony\Component\Validator\Constraint;
Expand Down
2 changes: 1 addition & 1 deletion src/CoreShop/Component/Address/Model/Address.php
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@

namespace CoreShop\Component\Address\Model;

use CoreShop\Component\Resource\ImplementedByPimcoreException;
use CoreShop\Component\Resource\Exception\ImplementedByPimcoreException;
use CoreShop\Component\Resource\Pimcore\Model\AbstractPimcoreModel;

class Address extends AbstractPimcoreModel implements AddressInterface
Expand Down
2 changes: 1 addition & 1 deletion src/CoreShop/Component/Core/Model/Cart.php
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

use CoreShop\Component\Order\Model\AdjustmentInterface;
use CoreShop\Component\Order\Model\Cart as BaseCart;
use CoreShop\Component\Resource\ImplementedByPimcoreException;
use CoreShop\Component\Resource\Exception\ImplementedByPimcoreException;
use CoreShop\Component\Shipping\Model\CarrierAwareTrait;

class Cart extends BaseCart implements CartInterface
Expand Down
2 changes: 1 addition & 1 deletion src/CoreShop/Component/Core/Model/Category.php
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
namespace CoreShop\Component\Core\Model;

use CoreShop\Component\Product\Model\Category as BaseCategory;
use CoreShop\Component\Resource\ImplementedByPimcoreException;
use CoreShop\Component\Resource\Exception\ImplementedByPimcoreException;

class Category extends BaseCategory implements CategoryInterface
{
Expand Down
2 changes: 1 addition & 1 deletion src/CoreShop/Component/Core/Model/Customer.php
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

use CoreShop\Component\Address\Model\AddressesAwareTrait;
use CoreShop\Component\Customer\Model\Customer as BaseCustomer;
use CoreShop\Component\Resource\ImplementedByPimcoreException;
use CoreShop\Component\Resource\Exception\ImplementedByPimcoreException;

class Customer extends BaseCustomer implements CustomerInterface
{
Expand Down
2 changes: 1 addition & 1 deletion src/CoreShop/Component/Core/Model/Order.php
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
namespace CoreShop\Component\Core\Model;

use CoreShop\Component\Order\Model\Order as BaseOrder;
use CoreShop\Component\Resource\ImplementedByPimcoreException;
use CoreShop\Component\Resource\Exception\ImplementedByPimcoreException;
use CoreShop\Component\Shipping\Model\CarrierAwareTrait;

class Order extends BaseOrder implements OrderInterface
Expand Down
2 changes: 1 addition & 1 deletion src/CoreShop/Component/Core/Model/Product.php
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
namespace CoreShop\Component\Core\Model;

use CoreShop\Component\Product\Model\Product as BaseProduct;
use CoreShop\Component\Resource\ImplementedByPimcoreException;
use CoreShop\Component\Resource\Exception\ImplementedByPimcoreException;

class Product extends BaseProduct implements ProductInterface
{
Expand Down
2 changes: 1 addition & 1 deletion src/CoreShop/Component/Core/Model/ProposalItemTrait.php
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@

namespace CoreShop\Component\Core\Model;

use CoreShop\Component\Resource\ImplementedByPimcoreException;
use CoreShop\Component\Resource\Exception\ImplementedByPimcoreException;

trait ProposalItemTrait
{
Expand Down
2 changes: 1 addition & 1 deletion src/CoreShop/Component/Core/Model/SaleItemTrait.php
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@

namespace CoreShop\Component\Core\Model;

use CoreShop\Component\Resource\ImplementedByPimcoreException;
use CoreShop\Component\Resource\Exception\ImplementedByPimcoreException;

trait SaleItemTrait
{
Expand Down
2 changes: 1 addition & 1 deletion src/CoreShop/Component/Customer/Model/Customer.php
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@

namespace CoreShop\Component\Customer\Model;

use CoreShop\Component\Resource\ImplementedByPimcoreException;
use CoreShop\Component\Resource\Exception\ImplementedByPimcoreException;
use CoreShop\Component\Resource\Pimcore\Model\AbstractPimcoreModel;
use Pimcore\Model\DataObject\ClassDefinition\Data\Password;
use Symfony\Component\Security\Core\User\UserInterface;
Expand Down
2 changes: 1 addition & 1 deletion src/CoreShop/Component/Customer/Model/CustomerGroup.php
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@

namespace CoreShop\Component\Customer\Model;

use CoreShop\Component\Resource\ImplementedByPimcoreException;
use CoreShop\Component\Resource\Exception\ImplementedByPimcoreException;
use CoreShop\Component\Resource\Pimcore\Model\AbstractPimcoreModel;

class CustomerGroup extends AbstractPimcoreModel implements CustomerGroupInterface
Expand Down
2 changes: 1 addition & 1 deletion src/CoreShop/Component/Order/Model/AbstractProposal.php
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
namespace CoreShop\Component\Order\Model;

use CoreShop\Component\Currency\Model\CurrencyAwareTrait;
use CoreShop\Component\Resource\ImplementedByPimcoreException;
use CoreShop\Component\Resource\Exception\ImplementedByPimcoreException;
use CoreShop\Component\Resource\Pimcore\Model\AbstractPimcoreModel;
use CoreShop\Component\Store\Model\StoreAwareTrait;
use Webmozart\Assert\Assert;
Expand Down
2 changes: 1 addition & 1 deletion src/CoreShop/Component/Order/Model/AdjustableTrait.php
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@

namespace CoreShop\Component\Order\Model;

use CoreShop\Component\Resource\ImplementedByPimcoreException;
use CoreShop\Component\Resource\Exception\ImplementedByPimcoreException;
use Pimcore\Model\DataObject\Fieldcollection;

trait AdjustableTrait
Expand Down
2 changes: 1 addition & 1 deletion src/CoreShop/Component/Order/Model/Adjustment.php
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@

namespace CoreShop\Component\Order\Model;

use CoreShop\Component\Resource\ImplementedByPimcoreException;
use CoreShop\Component\Resource\Exception\ImplementedByPimcoreException;
use CoreShop\Component\Resource\Pimcore\Model\AbstractPimcoreFieldcollection;

class Adjustment extends AbstractPimcoreFieldcollection implements AdjustmentInterface
Expand Down
2 changes: 1 addition & 1 deletion src/CoreShop/Component/Order/Model/BaseAdjustableTrait.php
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@

namespace CoreShop\Component\Order\Model;

use CoreShop\Component\Resource\ImplementedByPimcoreException;
use CoreShop\Component\Resource\Exception\ImplementedByPimcoreException;
use Pimcore\Model\DataObject\Fieldcollection;

trait BaseAdjustableTrait
Expand Down
2 changes: 1 addition & 1 deletion src/CoreShop/Component/Order/Model/Cart.php
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
namespace CoreShop\Component\Order\Model;

use CoreShop\Component\Currency\Model\CurrencyAwareTrait;
use CoreShop\Component\Resource\ImplementedByPimcoreException;
use CoreShop\Component\Resource\Exception\ImplementedByPimcoreException;
use CoreShop\Component\StorageList\Model\StorageListProductInterface;
use CoreShop\Component\Store\Model\StoreAwareTrait;
use CoreShop\Component\Taxation\Model\TaxItemInterface;
Expand Down
2 changes: 1 addition & 1 deletion src/CoreShop/Component/Order/Model/CartItem.php
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@

namespace CoreShop\Component\Order\Model;

use CoreShop\Component\Resource\ImplementedByPimcoreException;
use CoreShop\Component\Resource\Exception\ImplementedByPimcoreException;
use CoreShop\Component\Resource\Pimcore\Model\AbstractPimcoreModel;
use CoreShop\Component\Taxation\Model\TaxItemInterface;
use Pimcore\Model\DataObject\Fieldcollection;
Expand Down
2 changes: 1 addition & 1 deletion src/CoreShop/Component/Order/Model/Order.php
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@

namespace CoreShop\Component\Order\Model;

use CoreShop\Component\Resource\ImplementedByPimcoreException;
use CoreShop\Component\Resource\Exception\ImplementedByPimcoreException;

class Order extends Sale implements OrderInterface
{
Expand Down
2 changes: 1 addition & 1 deletion src/CoreShop/Component/Order/Model/OrderInvoice.php
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@

namespace CoreShop\Component\Order\Model;

use CoreShop\Component\Resource\ImplementedByPimcoreException;
use CoreShop\Component\Resource\Exception\ImplementedByPimcoreException;
use CoreShop\Component\Resource\Pimcore\Model\AbstractPimcoreModel;

class OrderInvoice extends AbstractPimcoreModel implements OrderInvoiceInterface
Expand Down
2 changes: 1 addition & 1 deletion src/CoreShop/Component/Order/Model/OrderInvoiceItem.php
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@

namespace CoreShop\Component\Order\Model;

use CoreShop\Component\Resource\ImplementedByPimcoreException;
use CoreShop\Component\Resource\Exception\ImplementedByPimcoreException;
use CoreShop\Component\Resource\Pimcore\Model\AbstractPimcoreModel;

class OrderInvoiceItem extends AbstractPimcoreModel implements OrderInvoiceItemInterface
Expand Down
2 changes: 1 addition & 1 deletion src/CoreShop/Component/Order/Model/OrderShipment.php
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@

namespace CoreShop\Component\Order\Model;

use CoreShop\Component\Resource\ImplementedByPimcoreException;
use CoreShop\Component\Resource\Exception\ImplementedByPimcoreException;
use CoreShop\Component\Resource\Pimcore\Model\AbstractPimcoreModel;

class OrderShipment extends AbstractPimcoreModel implements OrderShipmentInterface
Expand Down
2 changes: 1 addition & 1 deletion src/CoreShop/Component/Order/Model/OrderShipmentItem.php
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@

namespace CoreShop\Component\Order\Model;

use CoreShop\Component\Resource\ImplementedByPimcoreException;
use CoreShop\Component\Resource\Exception\ImplementedByPimcoreException;
use CoreShop\Component\Resource\Pimcore\Model\AbstractPimcoreModel;

class OrderShipmentItem extends AbstractPimcoreModel implements OrderShipmentItemInterface
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@

namespace CoreShop\Component\Order\Model;

use CoreShop\Component\Resource\ImplementedByPimcoreException;
use CoreShop\Component\Resource\Exception\ImplementedByPimcoreException;
use CoreShop\Component\Resource\Pimcore\Model\AbstractPimcoreFieldcollection;

class ProposalCartPriceRuleItem extends AbstractPimcoreFieldcollection implements ProposalCartPriceRuleItemInterface
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@

namespace CoreShop\Component\Order\Model;

use CoreShop\Component\Resource\ImplementedByPimcoreException;
use CoreShop\Component\Resource\Exception\ImplementedByPimcoreException;
use Pimcore\Model\DataObject\Fieldcollection;

trait ProposalPriceRuleTrait
Expand Down
2 changes: 1 addition & 1 deletion src/CoreShop/Component/Order/Model/Quote.php
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@

namespace CoreShop\Component\Order\Model;

use CoreShop\Component\Resource\ImplementedByPimcoreException;
use CoreShop\Component\Resource\Exception\ImplementedByPimcoreException;

class Quote extends Sale implements QuoteInterface
{
Expand Down
2 changes: 1 addition & 1 deletion src/CoreShop/Component/Order/Model/Sale.php
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@

namespace CoreShop\Component\Order\Model;

use CoreShop\Component\Resource\ImplementedByPimcoreException;
use CoreShop\Component\Resource\Exception\ImplementedByPimcoreException;
use Pimcore\Model\DataObject\Fieldcollection;

abstract class Sale extends AbstractProposal implements SaleInterface
Expand Down
2 changes: 1 addition & 1 deletion src/CoreShop/Component/Order/Model/SaleItem.php
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@

namespace CoreShop\Component\Order\Model;

use CoreShop\Component\Resource\ImplementedByPimcoreException;
use CoreShop\Component\Resource\Exception\ImplementedByPimcoreException;
use CoreShop\Component\Resource\Pimcore\Model\AbstractPimcoreModel;

abstract class SaleItem extends AbstractPimcoreModel implements SaleItemInterface
Expand Down
2 changes: 1 addition & 1 deletion src/CoreShop/Component/Product/Model/Category.php
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@

namespace CoreShop\Component\Product\Model;

use CoreShop\Component\Resource\ImplementedByPimcoreException;
use CoreShop\Component\Resource\Exception\ImplementedByPimcoreException;
use CoreShop\Component\Resource\Pimcore\Model\AbstractPimcoreModel;

class Category extends AbstractPimcoreModel implements CategoryInterface
Expand Down
2 changes: 1 addition & 1 deletion src/CoreShop/Component/Product/Model/Manufacturer.php
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@

namespace CoreShop\Component\Product\Model;

use CoreShop\Component\Resource\ImplementedByPimcoreException;
use CoreShop\Component\Resource\Exception\ImplementedByPimcoreException;
use CoreShop\Component\Resource\Pimcore\Model\AbstractPimcoreModel;

class Manufacturer extends AbstractPimcoreModel implements ManufacturerInterface
Expand Down
2 changes: 1 addition & 1 deletion src/CoreShop/Component/Product/Model/Product.php
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
namespace CoreShop\Component\Product\Model;

use CoreShop\Component\Product\Helper\VariantHelper;
use CoreShop\Component\Resource\ImplementedByPimcoreException;
use CoreShop\Component\Resource\Exception\ImplementedByPimcoreException;
use CoreShop\Component\Resource\Model\ToggleableTrait;
use CoreShop\Component\Resource\Pimcore\Model\AbstractPimcoreModel;
use CoreShop\Component\Resource\Pimcore\Model\PimcoreModelInterface;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
* @license https://www.coreshop.org/license GNU General Public License version 3 (GPLv3)
*/

namespace CoreShop\Component\Resource;
namespace CoreShop\Component\Resource\Exception;

class ImplementedByPimcoreException extends \InvalidArgumentException
{
Expand Down
2 changes: 1 addition & 1 deletion src/CoreShop/Component/Taxation/Model/TaxItem.php
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@

namespace CoreShop\Component\Taxation\Model;

use CoreShop\Component\Resource\ImplementedByPimcoreException;
use CoreShop\Component\Resource\Exception\ImplementedByPimcoreException;
use CoreShop\Component\Resource\Pimcore\Model\AbstractPimcoreFieldcollection;

class TaxItem extends AbstractPimcoreFieldcollection implements TaxItemInterface
Expand Down

0 comments on commit 4e46b27

Please sign in to comment.