Commit cfd54e9b authored by Damian Kryger's avatar Damian Kryger
Browse files

Merge branch '766-1-separating-bundles-refactoring' into 'master'

#766 refactoring towards separation of bundles

See merge request !593
parents 055fdb6d 4ca26a39
Pipeline #250622479 passed with stages
in 25 minutes and 45 seconds
......@@ -122,6 +122,8 @@ akeneo_pim_structure:
parameters:
pim_ce_dev_src_folder_location: '%kernel.project_dir%/vendor/akeneo/pim-community-dev'
installer_data: 'PcmtCustomDatasetBundle:pcmt_global'
# to switch to standard Akeneo demo data, use the following line:
# installer_data: 'PimInstallerBundle:icecat_demo_dev'
e2Open_import_files_directory: '%kernel.project_dir%/src/PcmtCoreBundle/Resources/E2OpenImport/'
cis_file_source: 'RHSC'
cis_file_path: '%kernel.project_dir%/src/PcmtCISBundle/Resources/E2OpenCIS/'
......
......@@ -10,7 +10,7 @@ declare(strict_types=1);
namespace PcmtCoreBundle\Connector\Job\JobParameters\ConstraintCollectionProvider;
use Akeneo\Tool\Component\Batch\Job\JobParameters\ConstraintCollectionProviderInterface;
use PcmtCoreBundle\Connector\Job\JobParameters\SupportedJobsTrait;
use PcmtSharedBundle\Connector\Job\JobParameters\SupportedJobsTrait;
use Symfony\Component\Validator\Constraints\Collection;
class ReferenceDataXmlDownloadProvider implements ConstraintCollectionProviderInterface
......
......@@ -10,7 +10,7 @@ declare(strict_types=1);
namespace PcmtCoreBundle\Connector\Job\JobParameters\ConstraintCollectionProvider;
use Akeneo\Tool\Component\Batch\Job\JobParameters\ConstraintCollectionProviderInterface;
use PcmtCoreBundle\Connector\Job\JobParameters\SupportedJobsTrait;
use PcmtSharedBundle\Connector\Job\JobParameters\SupportedJobsTrait;
use Symfony\Component\Validator\Constraints\Collection;
class ReferenceDataXmlImportProvider implements ConstraintCollectionProviderInterface
......
......@@ -10,7 +10,7 @@ declare(strict_types=1);
namespace PcmtCoreBundle\Connector\Job\JobParameters\DefaultValueProvider;
use Akeneo\Tool\Component\Batch\Job\JobParameters\DefaultValuesProviderInterface;
use PcmtCoreBundle\Connector\Job\JobParameters\SupportedJobsTrait;
use PcmtSharedBundle\Connector\Job\JobParameters\SupportedJobsTrait;
class ReferenceDataXmlDownloadProvider implements DefaultValuesProviderInterface
{
......
......@@ -10,7 +10,7 @@ declare(strict_types=1);
namespace PcmtCoreBundle\Connector\Job\JobParameters\DefaultValueProvider;
use Akeneo\Tool\Component\Batch\Job\JobParameters\DefaultValuesProviderInterface;
use PcmtCoreBundle\Connector\Job\JobParameters\SupportedJobsTrait;
use PcmtSharedBundle\Connector\Job\JobParameters\SupportedJobsTrait;
use Symfony\Component\Validator\Constraints\IsTrue;
use Symfony\Component\Validator\Constraints\NotBlank;
use Symfony\Component\Validator\Constraints\Type;
......
......@@ -14,7 +14,7 @@ use Akeneo\Pim\Enrichment\Component\Product\Connector\Reader\Database\ProductRea
use Akeneo\Pim\Enrichment\Component\Product\Query\Filter\Operators;
use Akeneo\Tool\Component\StorageUtils\Cursor\CursorInterface;
use Akeneo\UserManagement\Component\Repository\UserRepositoryInterface;
use PcmtPermissionsBundle\Service\CategoryWithPermissionsRepository;
use PcmtSharedBundle\Service\CategoryWithPermissionsRepositoryInterface;
use PcmtSharedBundle\Service\Checker\CategoryPermissionsCheckerInterface;
class MstSupplierExportReader extends ProductReader implements CrossJoinExportReaderInterface
......@@ -25,14 +25,14 @@ class MstSupplierExportReader extends ProductReader implements CrossJoinExportRe
/** @var bool */
private $firstCrossRead = true;
/** @var CategoryWithPermissionsRepository */
/** @var CategoryWithPermissionsRepositoryInterface */
private $categoryWithPermissionsRepository;
/** @var UserRepositoryInterface */
private $userRepository;
public function setCategoryWithPermissionsRepository(
CategoryWithPermissionsRepository $categoryWithPermissionsRepository
CategoryWithPermissionsRepositoryInterface $categoryWithPermissionsRepository
): void {
$this->categoryWithPermissionsRepository = $categoryWithPermissionsRepository;
}
......
......@@ -23,9 +23,10 @@ class NewDatabaseCommand extends DatabaseCommand
protected function launchCommands(): self
{
parent::launchCommands();
// in following command we use already imported xmls stored in code repository
$this->commandExecutor->runCommand('pcmt:handler:import_reference_data');
if ('PcmtCustomDatasetBundle:pcmt_global' === $this->getContainer()->getParameter('installer_data')) {
// in following command we use already imported xmls stored in code repository
$this->commandExecutor->runCommand('pcmt:handler:import_reference_data');
$this->commandExecutor->runCommand('pcmt:custom-dataset:create');
$this->getEventDispatcher()->dispatch(
InstallerEvents::POST_DATA_IMPORTED,
......
......@@ -10,11 +10,11 @@ declare(strict_types=1);
namespace PcmtRulesBundle\Connector\Job\ConstraintCollectionProvider;
use Akeneo\Tool\Component\Batch\Job\JobParameters\ConstraintCollectionProviderInterface;
use PcmtCoreBundle\Connector\Job\JobParameters\SupportedJobsTrait;
use PcmtRulesBundle\Connector\Job\Step\CopyProductsRuleStep;
use PcmtRulesBundle\Constraints\DifferentFamilyConstraint;
use PcmtRulesBundle\Constraints\FamilyHasNoVariantsConstraint;
use PcmtRulesBundle\Constraints\FamilyHasVariantsConstraint;
use PcmtSharedBundle\Connector\Job\JobParameters\SupportedJobsTrait;
use Symfony\Component\Validator\Constraints\Collection;
use Symfony\Component\Validator\Constraints\NotBlank;
use Symfony\Component\Validator\Constraints\Type;
......
......@@ -10,9 +10,9 @@ declare(strict_types=1);
namespace PcmtRulesBundle\Connector\Job\ConstraintCollectionProvider;
use Akeneo\Tool\Component\Batch\Job\JobParameters\ConstraintCollectionProviderInterface;
use PcmtCoreBundle\Connector\Job\JobParameters\SupportedJobsTrait;
use PcmtRulesBundle\Constraints\AttributeExistsInBothFamiliesConstraint;
use PcmtRulesBundle\Constraints\DifferentFamilyConstraint;
use PcmtSharedBundle\Connector\Job\JobParameters\SupportedJobsTrait;
use Symfony\Component\Validator\Constraints\Collection;
use Symfony\Component\Validator\Constraints\NotBlank;
use Symfony\Component\Validator\Constraints\Type;
......
......@@ -10,7 +10,7 @@ declare(strict_types=1);
namespace PcmtRulesBundle\Connector\Job\ConstraintCollectionProvider;
use Akeneo\Tool\Component\Batch\Job\JobParameters\ConstraintCollectionProviderInterface;
use PcmtCoreBundle\Connector\Job\JobParameters\SupportedJobsTrait;
use PcmtSharedBundle\Connector\Job\JobParameters\SupportedJobsTrait;
use Symfony\Component\Validator\Constraints\Collection;
use Symfony\Component\Validator\Constraints\NotBlank;
use Symfony\Component\Validator\Constraints\Type;
......
......@@ -10,7 +10,7 @@ declare(strict_types=1);
namespace PcmtRulesBundle\Connector\Job\ConstraintCollectionProvider;
use Akeneo\Tool\Component\Batch\Job\JobParameters\ConstraintCollectionProviderInterface;
use PcmtCoreBundle\Connector\Job\JobParameters\SupportedJobsTrait;
use PcmtSharedBundle\Connector\Job\JobParameters\SupportedJobsTrait;
use Symfony\Component\Validator\Constraints\Collection;
use Symfony\Component\Validator\Constraints\NotBlank;
use Symfony\Component\Validator\Constraints\Type;
......
......@@ -10,8 +10,8 @@ declare(strict_types=1);
namespace PcmtRulesBundle\Connector\Job\DefaultValueProvider;
use Akeneo\Tool\Component\Batch\Job\JobParameters\DefaultValuesProviderInterface;
use PcmtCoreBundle\Connector\Job\JobParameters\SupportedJobsTrait;
use PcmtRulesBundle\Connector\Job\Step\CopyProductsRuleStep;
use PcmtSharedBundle\Connector\Job\JobParameters\SupportedJobsTrait;
class CopyProductsDefaultValueProvider implements DefaultValuesProviderInterface
{
......
......@@ -10,7 +10,7 @@ declare(strict_types=1);
namespace PcmtRulesBundle\Connector\Job\DefaultValueProvider;
use Akeneo\Tool\Component\Batch\Job\JobParameters\DefaultValuesProviderInterface;
use PcmtCoreBundle\Connector\Job\JobParameters\SupportedJobsTrait;
use PcmtSharedBundle\Connector\Job\JobParameters\SupportedJobsTrait;
class FamilyToFamilyDefaultValueProvider implements DefaultValuesProviderInterface
{
......
......@@ -10,7 +10,7 @@ declare(strict_types=1);
namespace PcmtRulesBundle\Connector\Job\DefaultValueProvider;
use Akeneo\Tool\Component\Batch\Job\JobParameters\DefaultValuesProviderInterface;
use PcmtCoreBundle\Connector\Job\JobParameters\SupportedJobsTrait;
use PcmtSharedBundle\Connector\Job\JobParameters\SupportedJobsTrait;
class PullImagesDefaultValueProvider implements DefaultValuesProviderInterface
{
......
......@@ -10,7 +10,7 @@ declare(strict_types=1);
namespace PcmtRulesBundle\Connector\Job\DefaultValueProvider;
use Akeneo\Tool\Component\Batch\Job\JobParameters\DefaultValuesProviderInterface;
use PcmtCoreBundle\Connector\Job\JobParameters\SupportedJobsTrait;
use PcmtSharedBundle\Connector\Job\JobParameters\SupportedJobsTrait;
class SelectOptionsDefaultValueProvider implements DefaultValuesProviderInterface
{
......
......@@ -7,7 +7,7 @@
declare(strict_types=1);
namespace PcmtCoreBundle\Connector\Job\JobParameters;
namespace PcmtSharedBundle\Connector\Job\JobParameters;
use Akeneo\Tool\Component\Batch\Job\JobInterface;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment