Skip to content

Commit

Permalink
juse new bundle structure
Browse files Browse the repository at this point in the history
  • Loading branch information
solverat committed Aug 4, 2023
1 parent 4c4ccc8 commit 550304b
Show file tree
Hide file tree
Showing 111 changed files with 12 additions and 10 deletions.
3 changes: 2 additions & 1 deletion UPGRADE.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
],
"autoload": {
"psr-4": {
"JobsBundle\\": "src/JobsBundle"
"JobsBundle\\": "src/"
}
},
"autoload-dev": {
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
services:

JobsBundle\Controller\:
resource: '../../Controller'
resource: '../../src/Controller'
public: true
autowire: true
autoconfigure: true
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes
File renamed without changes
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -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'];
Expand Down
File renamed without changes.
File renamed without changes.
11 changes: 6 additions & 5 deletions src/JobsBundle/JobsBundle.php → src/JobsBundle.php
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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'));
}
}
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
2 changes: 1 addition & 1 deletion src/JobsBundle/Tool/Install.php → src/Tool/Install.php
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,6 @@ protected function installDbStructure(): void

protected function getInstallSourcesPath(): string
{
return __DIR__ . '/../Resources/install';
return __DIR__ . '/../../config/install';
}
}
File renamed without changes.
File renamed without changes.
File renamed without changes.

0 comments on commit 550304b

Please sign in to comment.