Skip to content

Commit 020ef82

Browse files
#5 Apply Symfony best practices : Directory Structure
1 parent 67a5bb7 commit 020ef82

27 files changed

Lines changed: 72 additions & 52 deletions

DependencyInjection/CleverAgeCacheProcessExtension.php

Lines changed: 0 additions & 26 deletions
This file was deleted.

composer.json

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,12 @@
2222
],
2323
"autoload": {
2424
"psr-4": {
25-
"CleverAge\\CacheProcessBundle\\": ""
25+
"CleverAge\\CacheProcessBundle\\": "src/"
26+
}
27+
},
28+
"autoload-dev": {
29+
"psr-4": {
30+
"CleverAge\\CacheProcessBundle\\Tests\\": "tests/"
2631
}
2732
},
2833
"require": {
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
services:
22
CleverAge\CacheProcessBundle\Task\:
3-
resource: '../../../Task/*'
3+
resource: '../../src/Task/*'
44
autowire: true
55
public: true
66
shared: false
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
services:
22
CleverAge\CacheProcessBundle\Transformer\:
3-
resource: '../../../Transformer/*'
3+
resource: '../../src/Transformer/*'
44
autowire: true
55
public: false
66
arguments:
Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,17 +8,14 @@
88
* file that was distributed with this source code.
99
*/
1010

11-
namespace CleverAge\CacheProcessBundle;
11+
namespace CleverAge\CacheProcessBundle\src;
1212

1313
use Symfony\Component\HttpKernel\Bundle\Bundle;
1414

15-
/**
16-
* Class CleverAgeCacheProcessBundle
17-
*
18-
* @author Valentin Clavreul <vclavreul@clever-age.com>
19-
* @author Vincent Chalnot <vchalnot@clever-age.com>
20-
* @author Madeline Veyrenc <mveyrenc@clever-age.com>
21-
*/
2215
class CleverAgeCacheProcessBundle extends Bundle
2316
{
17+
public function getPath(): string
18+
{
19+
return \dirname(__DIR__);
20+
}
2421
}
Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
<?php declare(strict_types=1);
2+
/**
3+
* This file is part of the CleverAge/CacheProcessBundle package.
4+
*
5+
* Copyright (C) 2017-2019 Clever-Age
6+
*
7+
* For the full copyright and license information, please view the LICENSE
8+
* file that was distributed with this source code.
9+
*/
10+
11+
namespace CleverAge\CacheProcessBundle\DependencyInjection;
12+
13+
use Symfony\Component\Config\FileLocator;
14+
use Symfony\Component\DependencyInjection\ContainerBuilder;
15+
use Symfony\Component\DependencyInjection\Extension\Extension;
16+
use Symfony\Component\DependencyInjection\Loader\YamlFileLoader;
17+
use Symfony\Component\Finder\Finder;
18+
19+
/**
20+
* This is the class that loads and manages your bundle configuration.
21+
*
22+
* @see http://symfony.com/doc/current/cookbook/bundles/extension.html
23+
*/
24+
class CleverAgeCacheProcessExtension extends Extension
25+
{
26+
public function load(array $configs, ContainerBuilder $container): void
27+
{
28+
$this->findServices($container, __DIR__.'/../../config/services');
29+
}
30+
31+
/**
32+
* Recursively import config files into container.
33+
*/
34+
protected function findServices(ContainerBuilder $container, string $path, string $extension = 'yaml'): void
35+
{
36+
$finder = new Finder();
37+
$finder->in($path)
38+
->name('*.'.$extension)->files();
39+
$loader = new YamlFileLoader($container, new FileLocator($path));
40+
foreach ($finder as $file) {
41+
$loader->load($file->getFilename());
42+
}
43+
}
44+
}

DependencyInjection/Compiler/CachePoolPass.php renamed to src/DependencyInjection/Compiler/CachePoolPass.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
* file that was distributed with this source code.
99
*/
1010

11-
namespace CleverAge\CacheProcessBundle\DependencyInjection\Compiler;
11+
namespace CleverAge\CacheProcessBundle\src\DependencyInjection\Compiler;
1212

1313
use Psr\Cache\CacheItemPoolInterface;
1414
use Symfony\Component\DependencyInjection\ChildDefinition;
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
* file that was distributed with this source code.
99
*/
1010

11-
namespace CleverAge\CacheProcessBundle\Task;
11+
namespace CleverAge\CacheProcessBundle\src\Task;
1212

1313
use CleverAge\ProcessBundle\Model\AbstractConfigurableTask;
1414
use CleverAge\ProcessBundle\Model\ProcessState;
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
* file that was distributed with this source code.
99
*/
1010

11-
namespace CleverAge\CacheProcessBundle\Task;
11+
namespace CleverAge\CacheProcessBundle\src\Task;
1212

1313
use CleverAge\ProcessBundle\Model\ProcessState;
1414
use Psr\Cache\InvalidArgumentException;
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
* file that was distributed with this source code.
99
*/
1010

11-
namespace CleverAge\CacheProcessBundle\Task;
11+
namespace CleverAge\CacheProcessBundle\src\Task;
1212

1313
use CleverAge\ProcessBundle\Model\ProcessState;
1414
use Psr\Cache\InvalidArgumentException;

0 commit comments

Comments
 (0)