From 550304b8e00513a662a792f9b8f268b5b207d2ef Mon Sep 17 00:00:00 2001 From: Stefan Hagspiel Date: Fri, 4 Aug 2023 13:59:25 +0200 Subject: [PATCH] juse new bundle structure --- UPGRADE.md | 3 ++- composer.json | 2 +- .../doctrine/model/ConnectorContextItem.orm.yml | 0 .../doctrine/model/ConnectorEngine.orm.yml | 0 .../doctrine/model/ContextDefinition.orm.yml | 0 .../config => config}/doctrine/model/LogEntry.orm.yml | 0 .../Resources/config => config}/external/seo.yaml | 0 .../Resources => config}/install/sql/install.sql | 0 .../install/translations/admin.csv | 0 .../Resources/config => config}/pimcore/config.yaml | 0 .../Resources/config => config}/pimcore/routing.yaml | 0 .../serialization/ConnectorContextItem.yaml | 0 .../serialization/ConnectorEngine.yaml | 0 .../serialization/ContextDefinition.yaml | 0 .../Resources/config => config}/services.yaml | 0 .../services/connector_definition.yaml | 0 .../Resources/config => config}/services/context.yaml | 0 .../config => config}/services/controller.yaml | 2 +- .../Resources/config => config}/services/install.yaml | 0 .../config => config}/services/maintenance.yaml | 0 .../Resources/config => config}/services/manager.yaml | 0 .../config => config}/services/registry.yaml | 0 .../config => config}/services/repository.yaml | 0 .../config => config}/services/services.yaml | 0 .../Resources/public => public}/css/admin.css | 0 .../public => public}/img/jobs_connector_options.svg | 0 .../public => public}/img/jobs_icon_white.svg | 0 .../js/connector/abstractConnector.js | 0 .../public => public}/js/connector/facebook.js | 0 .../public => public}/js/connector/google.js | 0 .../js/coreExtension/data/jobConnectorContext.js | 0 .../js/coreExtension/tags/jobConnectorContext.js | 0 .../Resources/public => public}/js/plugin.js | 0 .../Resources/public => public}/js/settingsPanel.js | 0 .../Connector/ConnectorDefinitionInterface.php | 0 .../ConnectorEngineConfigurationInterface.php | 0 src/{JobsBundle => }/Connector/ConnectorService.php | 0 .../Connector/ConnectorServiceInterface.php | 0 .../Connector/Facebook/ConnectorDefinition.php | 0 .../Connector/Facebook/EngineConfiguration.php | 0 .../Connector/Facebook/FeedGenerator.php | 0 .../Connector/Facebook/FeedTransformerDefinition.php | 0 .../Connector/Facebook/ItemTransformerDefinition.php | 0 .../Connector/Google/ConnectorDefinition.php | 0 .../Connector/Google/FeedGenerator.php | 0 .../Connector/Google/ItemTransformerDefinition.php | 0 src/{JobsBundle => }/Context/ContextService.php | 0 .../Context/ContextServiceInterface.php | 0 src/{JobsBundle => }/Context/ResolvedItem.php | 0 .../Context/ResolvedItemInterface.php | 0 .../Resolver/ContextItemsResolverInterface.php | 0 .../Context/Resolver/DynamicRouteRequestResolver.php | 0 .../Context/Resolver/FeedResolver.php | 0 .../Context/Resolver/PimcoreObjectResolver.php | 0 .../Context/Resolver/SeoQueueResolver.php | 0 .../Controller/Admin/LogController.php | 0 .../Controller/Admin/SettingsController.php | 0 .../Controller/FacebookController.php | 0 .../Controller/ProviderController.php | 0 .../CoreExtension/JobConnectorContext.php | 0 .../Compiler/ConnectorDefinitionPass.php | 0 .../Compiler/ContextItemsResolverPass.php | 0 .../DependencyInjection/Configuration.php | 0 .../DependencyInjection/JobsExtension.php | 2 +- .../EventListener/Admin/AssetListener.php | 0 .../EventListener/Maintenance/CleanUpLogsTask.php | 0 src/{JobsBundle => }/Feed/FeedGeneratorInterface.php | 0 src/{JobsBundle => }/JobsBundle.php | 11 ++++++----- .../Manager/ConnectorContextManager.php | 0 .../Manager/ConnectorContextManagerInterface.php | 0 src/{JobsBundle => }/Manager/ConnectorManager.php | 0 .../Manager/ConnectorManagerInterface.php | 0 .../Manager/ContextDefinitionManager.php | 0 .../Manager/ContextDefinitionManagerInterface.php | 0 src/{JobsBundle => }/Manager/LogManager.php | 0 src/{JobsBundle => }/Manager/LogManagerInterface.php | 0 src/{JobsBundle => }/Migrations/.gitkeep | 0 src/{JobsBundle => }/Model/ConnectorContextItem.php | 0 .../Model/ConnectorContextItemInterface.php | 0 src/{JobsBundle => }/Model/ConnectorEngine.php | 0 .../Model/ConnectorEngineInterface.php | 0 src/{JobsBundle => }/Model/ContextDefinition.php | 0 .../Model/ContextDefinitionInterface.php | 0 src/{JobsBundle => }/Model/LogEntry.php | 0 src/{JobsBundle => }/Model/LogEntryInterface.php | 0 src/{JobsBundle => }/Normalizer/EntityNormalizer.php | 0 .../Registry/ConnectorDefinitionRegistry.php | 0 .../Registry/ConnectorDefinitionRegistryInterface.php | 0 .../Registry/ContextItemsResolverRegistry.php | 0 .../ContextItemsResolverRegistryInterface.php | 0 .../Repository/ConnectorContextItemRepository.php | 0 .../ConnectorContextItemRepositoryInterface.php | 0 .../Repository/ConnectorEngineRepository.php | 0 .../Repository/ConnectorEngineRepositoryInterface.php | 0 .../Repository/ContextDefinitionRepository.php | 0 .../ContextDefinitionRepositoryInterface.php | 0 src/{JobsBundle => }/Repository/LogRepository.php | 0 .../Repository/LogRepositoryInterface.php | 0 .../Seo/Extractor/GoogleForJobsExtractor.php | 0 .../Seo/ResourceProcessor/GoogleJobsProcessor.php | 0 src/{JobsBundle => }/Service/EnvironmentService.php | 0 .../Service/EnvironmentServiceInterface.php | 0 src/{JobsBundle => }/Service/LinkGeneratorService.php | 0 .../Service/LinkGeneratorServiceInterface.php | 0 src/{JobsBundle => }/Tool/FeedIdHelper.php | 0 src/{JobsBundle => }/Tool/Install.php | 2 +- .../ItemTransformerDefinitionInterface.php | 0 .../Transformer/ItemTransformerInterface.php | 0 .../Resources/views => templates}/layout.html.twig | 0 .../translations => translations}/admin.de.yaml | 0 .../translations => translations}/admin.en.yaml | 0 111 files changed, 12 insertions(+), 10 deletions(-) rename {src/JobsBundle/Resources/config => config}/doctrine/model/ConnectorContextItem.orm.yml (100%) rename {src/JobsBundle/Resources/config => config}/doctrine/model/ConnectorEngine.orm.yml (100%) rename {src/JobsBundle/Resources/config => config}/doctrine/model/ContextDefinition.orm.yml (100%) rename {src/JobsBundle/Resources/config => config}/doctrine/model/LogEntry.orm.yml (100%) rename {src/JobsBundle/Resources/config => config}/external/seo.yaml (100%) rename {src/JobsBundle/Resources => config}/install/sql/install.sql (100%) rename {src/JobsBundle/Resources => config}/install/translations/admin.csv (100%) rename {src/JobsBundle/Resources/config => config}/pimcore/config.yaml (100%) rename {src/JobsBundle/Resources/config => config}/pimcore/routing.yaml (100%) rename {src/JobsBundle/Resources/config => config}/serialization/ConnectorContextItem.yaml (100%) rename {src/JobsBundle/Resources/config => config}/serialization/ConnectorEngine.yaml (100%) rename {src/JobsBundle/Resources/config => config}/serialization/ContextDefinition.yaml (100%) rename {src/JobsBundle/Resources/config => config}/services.yaml (100%) rename {src/JobsBundle/Resources/config => config}/services/connector_definition.yaml (100%) rename {src/JobsBundle/Resources/config => config}/services/context.yaml (100%) rename {src/JobsBundle/Resources/config => config}/services/controller.yaml (79%) rename {src/JobsBundle/Resources/config => config}/services/install.yaml (100%) rename {src/JobsBundle/Resources/config => config}/services/maintenance.yaml (100%) rename {src/JobsBundle/Resources/config => config}/services/manager.yaml (100%) rename {src/JobsBundle/Resources/config => config}/services/registry.yaml (100%) rename {src/JobsBundle/Resources/config => config}/services/repository.yaml (100%) rename {src/JobsBundle/Resources/config => config}/services/services.yaml (100%) rename {src/JobsBundle/Resources/public => public}/css/admin.css (100%) rename {src/JobsBundle/Resources/public => public}/img/jobs_connector_options.svg (100%) rename {src/JobsBundle/Resources/public => public}/img/jobs_icon_white.svg (100%) rename {src/JobsBundle/Resources/public => public}/js/connector/abstractConnector.js (100%) rename {src/JobsBundle/Resources/public => public}/js/connector/facebook.js (100%) rename {src/JobsBundle/Resources/public => public}/js/connector/google.js (100%) rename {src/JobsBundle/Resources/public => public}/js/coreExtension/data/jobConnectorContext.js (100%) rename {src/JobsBundle/Resources/public => public}/js/coreExtension/tags/jobConnectorContext.js (100%) rename {src/JobsBundle/Resources/public => public}/js/plugin.js (100%) rename {src/JobsBundle/Resources/public => public}/js/settingsPanel.js (100%) rename src/{JobsBundle => }/Connector/ConnectorDefinitionInterface.php (100%) rename src/{JobsBundle => }/Connector/ConnectorEngineConfigurationInterface.php (100%) rename src/{JobsBundle => }/Connector/ConnectorService.php (100%) rename src/{JobsBundle => }/Connector/ConnectorServiceInterface.php (100%) rename src/{JobsBundle => }/Connector/Facebook/ConnectorDefinition.php (100%) rename src/{JobsBundle => }/Connector/Facebook/EngineConfiguration.php (100%) rename src/{JobsBundle => }/Connector/Facebook/FeedGenerator.php (100%) rename src/{JobsBundle => }/Connector/Facebook/FeedTransformerDefinition.php (100%) rename src/{JobsBundle => }/Connector/Facebook/ItemTransformerDefinition.php (100%) rename src/{JobsBundle => }/Connector/Google/ConnectorDefinition.php (100%) rename src/{JobsBundle => }/Connector/Google/FeedGenerator.php (100%) rename src/{JobsBundle => }/Connector/Google/ItemTransformerDefinition.php (100%) rename src/{JobsBundle => }/Context/ContextService.php (100%) rename src/{JobsBundle => }/Context/ContextServiceInterface.php (100%) rename src/{JobsBundle => }/Context/ResolvedItem.php (100%) rename src/{JobsBundle => }/Context/ResolvedItemInterface.php (100%) rename src/{JobsBundle => }/Context/Resolver/ContextItemsResolverInterface.php (100%) rename src/{JobsBundle => }/Context/Resolver/DynamicRouteRequestResolver.php (100%) rename src/{JobsBundle => }/Context/Resolver/FeedResolver.php (100%) rename src/{JobsBundle => }/Context/Resolver/PimcoreObjectResolver.php (100%) rename src/{JobsBundle => }/Context/Resolver/SeoQueueResolver.php (100%) rename src/{JobsBundle => }/Controller/Admin/LogController.php (100%) rename src/{JobsBundle => }/Controller/Admin/SettingsController.php (100%) rename src/{JobsBundle => }/Controller/FacebookController.php (100%) rename src/{JobsBundle => }/Controller/ProviderController.php (100%) rename src/{JobsBundle => }/CoreExtension/JobConnectorContext.php (100%) rename src/{JobsBundle => }/DependencyInjection/Compiler/ConnectorDefinitionPass.php (100%) rename src/{JobsBundle => }/DependencyInjection/Compiler/ContextItemsResolverPass.php (100%) rename src/{JobsBundle => }/DependencyInjection/Configuration.php (100%) rename src/{JobsBundle => }/DependencyInjection/JobsExtension.php (99%) rename src/{JobsBundle => }/EventListener/Admin/AssetListener.php (100%) rename src/{JobsBundle => }/EventListener/Maintenance/CleanUpLogsTask.php (100%) rename src/{JobsBundle => }/Feed/FeedGeneratorInterface.php (100%) rename src/{JobsBundle => }/JobsBundle.php (90%) rename src/{JobsBundle => }/Manager/ConnectorContextManager.php (100%) rename src/{JobsBundle => }/Manager/ConnectorContextManagerInterface.php (100%) rename src/{JobsBundle => }/Manager/ConnectorManager.php (100%) rename src/{JobsBundle => }/Manager/ConnectorManagerInterface.php (100%) rename src/{JobsBundle => }/Manager/ContextDefinitionManager.php (100%) rename src/{JobsBundle => }/Manager/ContextDefinitionManagerInterface.php (100%) rename src/{JobsBundle => }/Manager/LogManager.php (100%) rename src/{JobsBundle => }/Manager/LogManagerInterface.php (100%) rename src/{JobsBundle => }/Migrations/.gitkeep (100%) rename src/{JobsBundle => }/Model/ConnectorContextItem.php (100%) rename src/{JobsBundle => }/Model/ConnectorContextItemInterface.php (100%) rename src/{JobsBundle => }/Model/ConnectorEngine.php (100%) rename src/{JobsBundle => }/Model/ConnectorEngineInterface.php (100%) rename src/{JobsBundle => }/Model/ContextDefinition.php (100%) rename src/{JobsBundle => }/Model/ContextDefinitionInterface.php (100%) rename src/{JobsBundle => }/Model/LogEntry.php (100%) rename src/{JobsBundle => }/Model/LogEntryInterface.php (100%) rename src/{JobsBundle => }/Normalizer/EntityNormalizer.php (100%) rename src/{JobsBundle => }/Registry/ConnectorDefinitionRegistry.php (100%) rename src/{JobsBundle => }/Registry/ConnectorDefinitionRegistryInterface.php (100%) rename src/{JobsBundle => }/Registry/ContextItemsResolverRegistry.php (100%) rename src/{JobsBundle => }/Registry/ContextItemsResolverRegistryInterface.php (100%) rename src/{JobsBundle => }/Repository/ConnectorContextItemRepository.php (100%) rename src/{JobsBundle => }/Repository/ConnectorContextItemRepositoryInterface.php (100%) rename src/{JobsBundle => }/Repository/ConnectorEngineRepository.php (100%) rename src/{JobsBundle => }/Repository/ConnectorEngineRepositoryInterface.php (100%) rename src/{JobsBundle => }/Repository/ContextDefinitionRepository.php (100%) rename src/{JobsBundle => }/Repository/ContextDefinitionRepositoryInterface.php (100%) rename src/{JobsBundle => }/Repository/LogRepository.php (100%) rename src/{JobsBundle => }/Repository/LogRepositoryInterface.php (100%) rename src/{JobsBundle => }/Seo/Extractor/GoogleForJobsExtractor.php (100%) rename src/{JobsBundle => }/Seo/ResourceProcessor/GoogleJobsProcessor.php (100%) rename src/{JobsBundle => }/Service/EnvironmentService.php (100%) rename src/{JobsBundle => }/Service/EnvironmentServiceInterface.php (100%) rename src/{JobsBundle => }/Service/LinkGeneratorService.php (100%) rename src/{JobsBundle => }/Service/LinkGeneratorServiceInterface.php (100%) rename src/{JobsBundle => }/Tool/FeedIdHelper.php (100%) rename src/{JobsBundle => }/Tool/Install.php (91%) rename src/{JobsBundle => }/Transformer/ItemTransformerDefinitionInterface.php (100%) rename src/{JobsBundle => }/Transformer/ItemTransformerInterface.php (100%) rename {src/JobsBundle/Resources/views => templates}/layout.html.twig (100%) rename {src/JobsBundle/Resources/translations => translations}/admin.de.yaml (100%) rename {src/JobsBundle/Resources/translations => translations}/admin.en.yaml (100%) diff --git a/UPGRADE.md b/UPGRADE.md index 2547d080..ab0487fe 100644 --- a/UPGRADE.md +++ b/UPGRADE.md @@ -3,7 +3,8 @@ ## Migrating from Version 2.x to Version 3.0.0 ### Global Changes -TBD +- Recommended folder structure by symfony adopted + *** JobsBundle 2.x Upgrade Notes: https://github.com/dachcom-digital/pimcore-jobs/blob/2.x/UPGRADE.md diff --git a/composer.json b/composer.json index 5e5e7722..66977db4 100755 --- a/composer.json +++ b/composer.json @@ -15,7 +15,7 @@ ], "autoload": { "psr-4": { - "JobsBundle\\": "src/JobsBundle" + "JobsBundle\\": "src/" } }, "autoload-dev": { diff --git a/src/JobsBundle/Resources/config/doctrine/model/ConnectorContextItem.orm.yml b/config/doctrine/model/ConnectorContextItem.orm.yml similarity index 100% rename from src/JobsBundle/Resources/config/doctrine/model/ConnectorContextItem.orm.yml rename to config/doctrine/model/ConnectorContextItem.orm.yml diff --git a/src/JobsBundle/Resources/config/doctrine/model/ConnectorEngine.orm.yml b/config/doctrine/model/ConnectorEngine.orm.yml similarity index 100% rename from src/JobsBundle/Resources/config/doctrine/model/ConnectorEngine.orm.yml rename to config/doctrine/model/ConnectorEngine.orm.yml diff --git a/src/JobsBundle/Resources/config/doctrine/model/ContextDefinition.orm.yml b/config/doctrine/model/ContextDefinition.orm.yml similarity index 100% rename from src/JobsBundle/Resources/config/doctrine/model/ContextDefinition.orm.yml rename to config/doctrine/model/ContextDefinition.orm.yml diff --git a/src/JobsBundle/Resources/config/doctrine/model/LogEntry.orm.yml b/config/doctrine/model/LogEntry.orm.yml similarity index 100% rename from src/JobsBundle/Resources/config/doctrine/model/LogEntry.orm.yml rename to config/doctrine/model/LogEntry.orm.yml diff --git a/src/JobsBundle/Resources/config/external/seo.yaml b/config/external/seo.yaml similarity index 100% rename from src/JobsBundle/Resources/config/external/seo.yaml rename to config/external/seo.yaml diff --git a/src/JobsBundle/Resources/install/sql/install.sql b/config/install/sql/install.sql similarity index 100% rename from src/JobsBundle/Resources/install/sql/install.sql rename to config/install/sql/install.sql diff --git a/src/JobsBundle/Resources/install/translations/admin.csv b/config/install/translations/admin.csv similarity index 100% rename from src/JobsBundle/Resources/install/translations/admin.csv rename to config/install/translations/admin.csv diff --git a/src/JobsBundle/Resources/config/pimcore/config.yaml b/config/pimcore/config.yaml similarity index 100% rename from src/JobsBundle/Resources/config/pimcore/config.yaml rename to config/pimcore/config.yaml diff --git a/src/JobsBundle/Resources/config/pimcore/routing.yaml b/config/pimcore/routing.yaml similarity index 100% rename from src/JobsBundle/Resources/config/pimcore/routing.yaml rename to config/pimcore/routing.yaml diff --git a/src/JobsBundle/Resources/config/serialization/ConnectorContextItem.yaml b/config/serialization/ConnectorContextItem.yaml similarity index 100% rename from src/JobsBundle/Resources/config/serialization/ConnectorContextItem.yaml rename to config/serialization/ConnectorContextItem.yaml diff --git a/src/JobsBundle/Resources/config/serialization/ConnectorEngine.yaml b/config/serialization/ConnectorEngine.yaml similarity index 100% rename from src/JobsBundle/Resources/config/serialization/ConnectorEngine.yaml rename to config/serialization/ConnectorEngine.yaml diff --git a/src/JobsBundle/Resources/config/serialization/ContextDefinition.yaml b/config/serialization/ContextDefinition.yaml similarity index 100% rename from src/JobsBundle/Resources/config/serialization/ContextDefinition.yaml rename to config/serialization/ContextDefinition.yaml diff --git a/src/JobsBundle/Resources/config/services.yaml b/config/services.yaml similarity index 100% rename from src/JobsBundle/Resources/config/services.yaml rename to config/services.yaml diff --git a/src/JobsBundle/Resources/config/services/connector_definition.yaml b/config/services/connector_definition.yaml similarity index 100% rename from src/JobsBundle/Resources/config/services/connector_definition.yaml rename to config/services/connector_definition.yaml diff --git a/src/JobsBundle/Resources/config/services/context.yaml b/config/services/context.yaml similarity index 100% rename from src/JobsBundle/Resources/config/services/context.yaml rename to config/services/context.yaml diff --git a/src/JobsBundle/Resources/config/services/controller.yaml b/config/services/controller.yaml similarity index 79% rename from src/JobsBundle/Resources/config/services/controller.yaml rename to config/services/controller.yaml index 8a286c81..b871d2d7 100644 --- a/src/JobsBundle/Resources/config/services/controller.yaml +++ b/config/services/controller.yaml @@ -1,7 +1,7 @@ services: JobsBundle\Controller\: - resource: '../../Controller' + resource: '../../src/Controller' public: true autowire: true autoconfigure: true diff --git a/src/JobsBundle/Resources/config/services/install.yaml b/config/services/install.yaml similarity index 100% rename from src/JobsBundle/Resources/config/services/install.yaml rename to config/services/install.yaml diff --git a/src/JobsBundle/Resources/config/services/maintenance.yaml b/config/services/maintenance.yaml similarity index 100% rename from src/JobsBundle/Resources/config/services/maintenance.yaml rename to config/services/maintenance.yaml diff --git a/src/JobsBundle/Resources/config/services/manager.yaml b/config/services/manager.yaml similarity index 100% rename from src/JobsBundle/Resources/config/services/manager.yaml rename to config/services/manager.yaml diff --git a/src/JobsBundle/Resources/config/services/registry.yaml b/config/services/registry.yaml similarity index 100% rename from src/JobsBundle/Resources/config/services/registry.yaml rename to config/services/registry.yaml diff --git a/src/JobsBundle/Resources/config/services/repository.yaml b/config/services/repository.yaml similarity index 100% rename from src/JobsBundle/Resources/config/services/repository.yaml rename to config/services/repository.yaml diff --git a/src/JobsBundle/Resources/config/services/services.yaml b/config/services/services.yaml similarity index 100% rename from src/JobsBundle/Resources/config/services/services.yaml rename to config/services/services.yaml diff --git a/src/JobsBundle/Resources/public/css/admin.css b/public/css/admin.css similarity index 100% rename from src/JobsBundle/Resources/public/css/admin.css rename to public/css/admin.css diff --git a/src/JobsBundle/Resources/public/img/jobs_connector_options.svg b/public/img/jobs_connector_options.svg similarity index 100% rename from src/JobsBundle/Resources/public/img/jobs_connector_options.svg rename to public/img/jobs_connector_options.svg diff --git a/src/JobsBundle/Resources/public/img/jobs_icon_white.svg b/public/img/jobs_icon_white.svg similarity index 100% rename from src/JobsBundle/Resources/public/img/jobs_icon_white.svg rename to public/img/jobs_icon_white.svg diff --git a/src/JobsBundle/Resources/public/js/connector/abstractConnector.js b/public/js/connector/abstractConnector.js similarity index 100% rename from src/JobsBundle/Resources/public/js/connector/abstractConnector.js rename to public/js/connector/abstractConnector.js diff --git a/src/JobsBundle/Resources/public/js/connector/facebook.js b/public/js/connector/facebook.js similarity index 100% rename from src/JobsBundle/Resources/public/js/connector/facebook.js rename to public/js/connector/facebook.js diff --git a/src/JobsBundle/Resources/public/js/connector/google.js b/public/js/connector/google.js similarity index 100% rename from src/JobsBundle/Resources/public/js/connector/google.js rename to public/js/connector/google.js diff --git a/src/JobsBundle/Resources/public/js/coreExtension/data/jobConnectorContext.js b/public/js/coreExtension/data/jobConnectorContext.js similarity index 100% rename from src/JobsBundle/Resources/public/js/coreExtension/data/jobConnectorContext.js rename to public/js/coreExtension/data/jobConnectorContext.js diff --git a/src/JobsBundle/Resources/public/js/coreExtension/tags/jobConnectorContext.js b/public/js/coreExtension/tags/jobConnectorContext.js similarity index 100% rename from src/JobsBundle/Resources/public/js/coreExtension/tags/jobConnectorContext.js rename to public/js/coreExtension/tags/jobConnectorContext.js diff --git a/src/JobsBundle/Resources/public/js/plugin.js b/public/js/plugin.js similarity index 100% rename from src/JobsBundle/Resources/public/js/plugin.js rename to public/js/plugin.js diff --git a/src/JobsBundle/Resources/public/js/settingsPanel.js b/public/js/settingsPanel.js similarity index 100% rename from src/JobsBundle/Resources/public/js/settingsPanel.js rename to public/js/settingsPanel.js diff --git a/src/JobsBundle/Connector/ConnectorDefinitionInterface.php b/src/Connector/ConnectorDefinitionInterface.php similarity index 100% rename from src/JobsBundle/Connector/ConnectorDefinitionInterface.php rename to src/Connector/ConnectorDefinitionInterface.php diff --git a/src/JobsBundle/Connector/ConnectorEngineConfigurationInterface.php b/src/Connector/ConnectorEngineConfigurationInterface.php similarity index 100% rename from src/JobsBundle/Connector/ConnectorEngineConfigurationInterface.php rename to src/Connector/ConnectorEngineConfigurationInterface.php diff --git a/src/JobsBundle/Connector/ConnectorService.php b/src/Connector/ConnectorService.php similarity index 100% rename from src/JobsBundle/Connector/ConnectorService.php rename to src/Connector/ConnectorService.php diff --git a/src/JobsBundle/Connector/ConnectorServiceInterface.php b/src/Connector/ConnectorServiceInterface.php similarity index 100% rename from src/JobsBundle/Connector/ConnectorServiceInterface.php rename to src/Connector/ConnectorServiceInterface.php diff --git a/src/JobsBundle/Connector/Facebook/ConnectorDefinition.php b/src/Connector/Facebook/ConnectorDefinition.php similarity index 100% rename from src/JobsBundle/Connector/Facebook/ConnectorDefinition.php rename to src/Connector/Facebook/ConnectorDefinition.php diff --git a/src/JobsBundle/Connector/Facebook/EngineConfiguration.php b/src/Connector/Facebook/EngineConfiguration.php similarity index 100% rename from src/JobsBundle/Connector/Facebook/EngineConfiguration.php rename to src/Connector/Facebook/EngineConfiguration.php diff --git a/src/JobsBundle/Connector/Facebook/FeedGenerator.php b/src/Connector/Facebook/FeedGenerator.php similarity index 100% rename from src/JobsBundle/Connector/Facebook/FeedGenerator.php rename to src/Connector/Facebook/FeedGenerator.php diff --git a/src/JobsBundle/Connector/Facebook/FeedTransformerDefinition.php b/src/Connector/Facebook/FeedTransformerDefinition.php similarity index 100% rename from src/JobsBundle/Connector/Facebook/FeedTransformerDefinition.php rename to src/Connector/Facebook/FeedTransformerDefinition.php diff --git a/src/JobsBundle/Connector/Facebook/ItemTransformerDefinition.php b/src/Connector/Facebook/ItemTransformerDefinition.php similarity index 100% rename from src/JobsBundle/Connector/Facebook/ItemTransformerDefinition.php rename to src/Connector/Facebook/ItemTransformerDefinition.php diff --git a/src/JobsBundle/Connector/Google/ConnectorDefinition.php b/src/Connector/Google/ConnectorDefinition.php similarity index 100% rename from src/JobsBundle/Connector/Google/ConnectorDefinition.php rename to src/Connector/Google/ConnectorDefinition.php diff --git a/src/JobsBundle/Connector/Google/FeedGenerator.php b/src/Connector/Google/FeedGenerator.php similarity index 100% rename from src/JobsBundle/Connector/Google/FeedGenerator.php rename to src/Connector/Google/FeedGenerator.php diff --git a/src/JobsBundle/Connector/Google/ItemTransformerDefinition.php b/src/Connector/Google/ItemTransformerDefinition.php similarity index 100% rename from src/JobsBundle/Connector/Google/ItemTransformerDefinition.php rename to src/Connector/Google/ItemTransformerDefinition.php diff --git a/src/JobsBundle/Context/ContextService.php b/src/Context/ContextService.php similarity index 100% rename from src/JobsBundle/Context/ContextService.php rename to src/Context/ContextService.php diff --git a/src/JobsBundle/Context/ContextServiceInterface.php b/src/Context/ContextServiceInterface.php similarity index 100% rename from src/JobsBundle/Context/ContextServiceInterface.php rename to src/Context/ContextServiceInterface.php diff --git a/src/JobsBundle/Context/ResolvedItem.php b/src/Context/ResolvedItem.php similarity index 100% rename from src/JobsBundle/Context/ResolvedItem.php rename to src/Context/ResolvedItem.php diff --git a/src/JobsBundle/Context/ResolvedItemInterface.php b/src/Context/ResolvedItemInterface.php similarity index 100% rename from src/JobsBundle/Context/ResolvedItemInterface.php rename to src/Context/ResolvedItemInterface.php diff --git a/src/JobsBundle/Context/Resolver/ContextItemsResolverInterface.php b/src/Context/Resolver/ContextItemsResolverInterface.php similarity index 100% rename from src/JobsBundle/Context/Resolver/ContextItemsResolverInterface.php rename to src/Context/Resolver/ContextItemsResolverInterface.php diff --git a/src/JobsBundle/Context/Resolver/DynamicRouteRequestResolver.php b/src/Context/Resolver/DynamicRouteRequestResolver.php similarity index 100% rename from src/JobsBundle/Context/Resolver/DynamicRouteRequestResolver.php rename to src/Context/Resolver/DynamicRouteRequestResolver.php diff --git a/src/JobsBundle/Context/Resolver/FeedResolver.php b/src/Context/Resolver/FeedResolver.php similarity index 100% rename from src/JobsBundle/Context/Resolver/FeedResolver.php rename to src/Context/Resolver/FeedResolver.php diff --git a/src/JobsBundle/Context/Resolver/PimcoreObjectResolver.php b/src/Context/Resolver/PimcoreObjectResolver.php similarity index 100% rename from src/JobsBundle/Context/Resolver/PimcoreObjectResolver.php rename to src/Context/Resolver/PimcoreObjectResolver.php diff --git a/src/JobsBundle/Context/Resolver/SeoQueueResolver.php b/src/Context/Resolver/SeoQueueResolver.php similarity index 100% rename from src/JobsBundle/Context/Resolver/SeoQueueResolver.php rename to src/Context/Resolver/SeoQueueResolver.php diff --git a/src/JobsBundle/Controller/Admin/LogController.php b/src/Controller/Admin/LogController.php similarity index 100% rename from src/JobsBundle/Controller/Admin/LogController.php rename to src/Controller/Admin/LogController.php diff --git a/src/JobsBundle/Controller/Admin/SettingsController.php b/src/Controller/Admin/SettingsController.php similarity index 100% rename from src/JobsBundle/Controller/Admin/SettingsController.php rename to src/Controller/Admin/SettingsController.php diff --git a/src/JobsBundle/Controller/FacebookController.php b/src/Controller/FacebookController.php similarity index 100% rename from src/JobsBundle/Controller/FacebookController.php rename to src/Controller/FacebookController.php diff --git a/src/JobsBundle/Controller/ProviderController.php b/src/Controller/ProviderController.php similarity index 100% rename from src/JobsBundle/Controller/ProviderController.php rename to src/Controller/ProviderController.php diff --git a/src/JobsBundle/CoreExtension/JobConnectorContext.php b/src/CoreExtension/JobConnectorContext.php similarity index 100% rename from src/JobsBundle/CoreExtension/JobConnectorContext.php rename to src/CoreExtension/JobConnectorContext.php diff --git a/src/JobsBundle/DependencyInjection/Compiler/ConnectorDefinitionPass.php b/src/DependencyInjection/Compiler/ConnectorDefinitionPass.php similarity index 100% rename from src/JobsBundle/DependencyInjection/Compiler/ConnectorDefinitionPass.php rename to src/DependencyInjection/Compiler/ConnectorDefinitionPass.php diff --git a/src/JobsBundle/DependencyInjection/Compiler/ContextItemsResolverPass.php b/src/DependencyInjection/Compiler/ContextItemsResolverPass.php similarity index 100% rename from src/JobsBundle/DependencyInjection/Compiler/ContextItemsResolverPass.php rename to src/DependencyInjection/Compiler/ContextItemsResolverPass.php diff --git a/src/JobsBundle/DependencyInjection/Configuration.php b/src/DependencyInjection/Configuration.php similarity index 100% rename from src/JobsBundle/DependencyInjection/Configuration.php rename to src/DependencyInjection/Configuration.php diff --git a/src/JobsBundle/DependencyInjection/JobsExtension.php b/src/DependencyInjection/JobsExtension.php similarity index 99% rename from src/JobsBundle/DependencyInjection/JobsExtension.php rename to src/DependencyInjection/JobsExtension.php index 57e7bcaf..5619bc9e 100644 --- a/src/JobsBundle/DependencyInjection/JobsExtension.php +++ b/src/DependencyInjection/JobsExtension.php @@ -15,7 +15,7 @@ public function load(array $configs, ContainerBuilder $container): void $configuration = new Configuration(); $config = $this->processConfiguration($configuration, $configs); - $loader = new YamlFileLoader($container, new FileLocator([__DIR__ . '/../Resources/config'])); + $loader = new YamlFileLoader($container, new FileLocator([__DIR__ . '/../../config'])); $loader->load('services.yaml'); $persistenceConfig = $config['persistence']['doctrine']; diff --git a/src/JobsBundle/EventListener/Admin/AssetListener.php b/src/EventListener/Admin/AssetListener.php similarity index 100% rename from src/JobsBundle/EventListener/Admin/AssetListener.php rename to src/EventListener/Admin/AssetListener.php diff --git a/src/JobsBundle/EventListener/Maintenance/CleanUpLogsTask.php b/src/EventListener/Maintenance/CleanUpLogsTask.php similarity index 100% rename from src/JobsBundle/EventListener/Maintenance/CleanUpLogsTask.php rename to src/EventListener/Maintenance/CleanUpLogsTask.php diff --git a/src/JobsBundle/Feed/FeedGeneratorInterface.php b/src/Feed/FeedGeneratorInterface.php similarity index 100% rename from src/JobsBundle/Feed/FeedGeneratorInterface.php rename to src/Feed/FeedGeneratorInterface.php diff --git a/src/JobsBundle/JobsBundle.php b/src/JobsBundle.php similarity index 90% rename from src/JobsBundle/JobsBundle.php rename to src/JobsBundle.php index 3576eb90..73563213 100644 --- a/src/JobsBundle/JobsBundle.php +++ b/src/JobsBundle.php @@ -29,6 +29,11 @@ public function build(ContainerBuilder $container): void $container->addCompilerPass(new ContextItemsResolverPass()); } + public function getPath(): string + { + return \dirname(__DIR__); + } + protected function getComposerPackageName(): string { return self::PACKAGE_NAME; @@ -52,10 +57,6 @@ protected function getNamespaceName(): string protected function getNameSpacePath(): string { - return sprintf( - '%s/Resources/config/doctrine/%s', - $this->getPath(), - 'model' - ); + return realpath(sprintf('%s/config/doctrine/%s', $this->getPath(), 'model')); } } diff --git a/src/JobsBundle/Manager/ConnectorContextManager.php b/src/Manager/ConnectorContextManager.php similarity index 100% rename from src/JobsBundle/Manager/ConnectorContextManager.php rename to src/Manager/ConnectorContextManager.php diff --git a/src/JobsBundle/Manager/ConnectorContextManagerInterface.php b/src/Manager/ConnectorContextManagerInterface.php similarity index 100% rename from src/JobsBundle/Manager/ConnectorContextManagerInterface.php rename to src/Manager/ConnectorContextManagerInterface.php diff --git a/src/JobsBundle/Manager/ConnectorManager.php b/src/Manager/ConnectorManager.php similarity index 100% rename from src/JobsBundle/Manager/ConnectorManager.php rename to src/Manager/ConnectorManager.php diff --git a/src/JobsBundle/Manager/ConnectorManagerInterface.php b/src/Manager/ConnectorManagerInterface.php similarity index 100% rename from src/JobsBundle/Manager/ConnectorManagerInterface.php rename to src/Manager/ConnectorManagerInterface.php diff --git a/src/JobsBundle/Manager/ContextDefinitionManager.php b/src/Manager/ContextDefinitionManager.php similarity index 100% rename from src/JobsBundle/Manager/ContextDefinitionManager.php rename to src/Manager/ContextDefinitionManager.php diff --git a/src/JobsBundle/Manager/ContextDefinitionManagerInterface.php b/src/Manager/ContextDefinitionManagerInterface.php similarity index 100% rename from src/JobsBundle/Manager/ContextDefinitionManagerInterface.php rename to src/Manager/ContextDefinitionManagerInterface.php diff --git a/src/JobsBundle/Manager/LogManager.php b/src/Manager/LogManager.php similarity index 100% rename from src/JobsBundle/Manager/LogManager.php rename to src/Manager/LogManager.php diff --git a/src/JobsBundle/Manager/LogManagerInterface.php b/src/Manager/LogManagerInterface.php similarity index 100% rename from src/JobsBundle/Manager/LogManagerInterface.php rename to src/Manager/LogManagerInterface.php diff --git a/src/JobsBundle/Migrations/.gitkeep b/src/Migrations/.gitkeep similarity index 100% rename from src/JobsBundle/Migrations/.gitkeep rename to src/Migrations/.gitkeep diff --git a/src/JobsBundle/Model/ConnectorContextItem.php b/src/Model/ConnectorContextItem.php similarity index 100% rename from src/JobsBundle/Model/ConnectorContextItem.php rename to src/Model/ConnectorContextItem.php diff --git a/src/JobsBundle/Model/ConnectorContextItemInterface.php b/src/Model/ConnectorContextItemInterface.php similarity index 100% rename from src/JobsBundle/Model/ConnectorContextItemInterface.php rename to src/Model/ConnectorContextItemInterface.php diff --git a/src/JobsBundle/Model/ConnectorEngine.php b/src/Model/ConnectorEngine.php similarity index 100% rename from src/JobsBundle/Model/ConnectorEngine.php rename to src/Model/ConnectorEngine.php diff --git a/src/JobsBundle/Model/ConnectorEngineInterface.php b/src/Model/ConnectorEngineInterface.php similarity index 100% rename from src/JobsBundle/Model/ConnectorEngineInterface.php rename to src/Model/ConnectorEngineInterface.php diff --git a/src/JobsBundle/Model/ContextDefinition.php b/src/Model/ContextDefinition.php similarity index 100% rename from src/JobsBundle/Model/ContextDefinition.php rename to src/Model/ContextDefinition.php diff --git a/src/JobsBundle/Model/ContextDefinitionInterface.php b/src/Model/ContextDefinitionInterface.php similarity index 100% rename from src/JobsBundle/Model/ContextDefinitionInterface.php rename to src/Model/ContextDefinitionInterface.php diff --git a/src/JobsBundle/Model/LogEntry.php b/src/Model/LogEntry.php similarity index 100% rename from src/JobsBundle/Model/LogEntry.php rename to src/Model/LogEntry.php diff --git a/src/JobsBundle/Model/LogEntryInterface.php b/src/Model/LogEntryInterface.php similarity index 100% rename from src/JobsBundle/Model/LogEntryInterface.php rename to src/Model/LogEntryInterface.php diff --git a/src/JobsBundle/Normalizer/EntityNormalizer.php b/src/Normalizer/EntityNormalizer.php similarity index 100% rename from src/JobsBundle/Normalizer/EntityNormalizer.php rename to src/Normalizer/EntityNormalizer.php diff --git a/src/JobsBundle/Registry/ConnectorDefinitionRegistry.php b/src/Registry/ConnectorDefinitionRegistry.php similarity index 100% rename from src/JobsBundle/Registry/ConnectorDefinitionRegistry.php rename to src/Registry/ConnectorDefinitionRegistry.php diff --git a/src/JobsBundle/Registry/ConnectorDefinitionRegistryInterface.php b/src/Registry/ConnectorDefinitionRegistryInterface.php similarity index 100% rename from src/JobsBundle/Registry/ConnectorDefinitionRegistryInterface.php rename to src/Registry/ConnectorDefinitionRegistryInterface.php diff --git a/src/JobsBundle/Registry/ContextItemsResolverRegistry.php b/src/Registry/ContextItemsResolverRegistry.php similarity index 100% rename from src/JobsBundle/Registry/ContextItemsResolverRegistry.php rename to src/Registry/ContextItemsResolverRegistry.php diff --git a/src/JobsBundle/Registry/ContextItemsResolverRegistryInterface.php b/src/Registry/ContextItemsResolverRegistryInterface.php similarity index 100% rename from src/JobsBundle/Registry/ContextItemsResolverRegistryInterface.php rename to src/Registry/ContextItemsResolverRegistryInterface.php diff --git a/src/JobsBundle/Repository/ConnectorContextItemRepository.php b/src/Repository/ConnectorContextItemRepository.php similarity index 100% rename from src/JobsBundle/Repository/ConnectorContextItemRepository.php rename to src/Repository/ConnectorContextItemRepository.php diff --git a/src/JobsBundle/Repository/ConnectorContextItemRepositoryInterface.php b/src/Repository/ConnectorContextItemRepositoryInterface.php similarity index 100% rename from src/JobsBundle/Repository/ConnectorContextItemRepositoryInterface.php rename to src/Repository/ConnectorContextItemRepositoryInterface.php diff --git a/src/JobsBundle/Repository/ConnectorEngineRepository.php b/src/Repository/ConnectorEngineRepository.php similarity index 100% rename from src/JobsBundle/Repository/ConnectorEngineRepository.php rename to src/Repository/ConnectorEngineRepository.php diff --git a/src/JobsBundle/Repository/ConnectorEngineRepositoryInterface.php b/src/Repository/ConnectorEngineRepositoryInterface.php similarity index 100% rename from src/JobsBundle/Repository/ConnectorEngineRepositoryInterface.php rename to src/Repository/ConnectorEngineRepositoryInterface.php diff --git a/src/JobsBundle/Repository/ContextDefinitionRepository.php b/src/Repository/ContextDefinitionRepository.php similarity index 100% rename from src/JobsBundle/Repository/ContextDefinitionRepository.php rename to src/Repository/ContextDefinitionRepository.php diff --git a/src/JobsBundle/Repository/ContextDefinitionRepositoryInterface.php b/src/Repository/ContextDefinitionRepositoryInterface.php similarity index 100% rename from src/JobsBundle/Repository/ContextDefinitionRepositoryInterface.php rename to src/Repository/ContextDefinitionRepositoryInterface.php diff --git a/src/JobsBundle/Repository/LogRepository.php b/src/Repository/LogRepository.php similarity index 100% rename from src/JobsBundle/Repository/LogRepository.php rename to src/Repository/LogRepository.php diff --git a/src/JobsBundle/Repository/LogRepositoryInterface.php b/src/Repository/LogRepositoryInterface.php similarity index 100% rename from src/JobsBundle/Repository/LogRepositoryInterface.php rename to src/Repository/LogRepositoryInterface.php diff --git a/src/JobsBundle/Seo/Extractor/GoogleForJobsExtractor.php b/src/Seo/Extractor/GoogleForJobsExtractor.php similarity index 100% rename from src/JobsBundle/Seo/Extractor/GoogleForJobsExtractor.php rename to src/Seo/Extractor/GoogleForJobsExtractor.php diff --git a/src/JobsBundle/Seo/ResourceProcessor/GoogleJobsProcessor.php b/src/Seo/ResourceProcessor/GoogleJobsProcessor.php similarity index 100% rename from src/JobsBundle/Seo/ResourceProcessor/GoogleJobsProcessor.php rename to src/Seo/ResourceProcessor/GoogleJobsProcessor.php diff --git a/src/JobsBundle/Service/EnvironmentService.php b/src/Service/EnvironmentService.php similarity index 100% rename from src/JobsBundle/Service/EnvironmentService.php rename to src/Service/EnvironmentService.php diff --git a/src/JobsBundle/Service/EnvironmentServiceInterface.php b/src/Service/EnvironmentServiceInterface.php similarity index 100% rename from src/JobsBundle/Service/EnvironmentServiceInterface.php rename to src/Service/EnvironmentServiceInterface.php diff --git a/src/JobsBundle/Service/LinkGeneratorService.php b/src/Service/LinkGeneratorService.php similarity index 100% rename from src/JobsBundle/Service/LinkGeneratorService.php rename to src/Service/LinkGeneratorService.php diff --git a/src/JobsBundle/Service/LinkGeneratorServiceInterface.php b/src/Service/LinkGeneratorServiceInterface.php similarity index 100% rename from src/JobsBundle/Service/LinkGeneratorServiceInterface.php rename to src/Service/LinkGeneratorServiceInterface.php diff --git a/src/JobsBundle/Tool/FeedIdHelper.php b/src/Tool/FeedIdHelper.php similarity index 100% rename from src/JobsBundle/Tool/FeedIdHelper.php rename to src/Tool/FeedIdHelper.php diff --git a/src/JobsBundle/Tool/Install.php b/src/Tool/Install.php similarity index 91% rename from src/JobsBundle/Tool/Install.php rename to src/Tool/Install.php index b843d5b2..6859dd43 100644 --- a/src/JobsBundle/Tool/Install.php +++ b/src/Tool/Install.php @@ -21,6 +21,6 @@ protected function installDbStructure(): void protected function getInstallSourcesPath(): string { - return __DIR__ . '/../Resources/install'; + return __DIR__ . '/../../config/install'; } } diff --git a/src/JobsBundle/Transformer/ItemTransformerDefinitionInterface.php b/src/Transformer/ItemTransformerDefinitionInterface.php similarity index 100% rename from src/JobsBundle/Transformer/ItemTransformerDefinitionInterface.php rename to src/Transformer/ItemTransformerDefinitionInterface.php diff --git a/src/JobsBundle/Transformer/ItemTransformerInterface.php b/src/Transformer/ItemTransformerInterface.php similarity index 100% rename from src/JobsBundle/Transformer/ItemTransformerInterface.php rename to src/Transformer/ItemTransformerInterface.php diff --git a/src/JobsBundle/Resources/views/layout.html.twig b/templates/layout.html.twig similarity index 100% rename from src/JobsBundle/Resources/views/layout.html.twig rename to templates/layout.html.twig diff --git a/src/JobsBundle/Resources/translations/admin.de.yaml b/translations/admin.de.yaml similarity index 100% rename from src/JobsBundle/Resources/translations/admin.de.yaml rename to translations/admin.de.yaml diff --git a/src/JobsBundle/Resources/translations/admin.en.yaml b/translations/admin.en.yaml similarity index 100% rename from src/JobsBundle/Resources/translations/admin.en.yaml rename to translations/admin.en.yaml