diff --git a/src/Bundle/ChillBudgetBundle/Calculator/CalculatorInterface.php b/src/Bundle/ChillBudgetBundle/Calculator/CalculatorInterface.php index 707ae0221..88bd5cf23 100644 --- a/src/Bundle/ChillBudgetBundle/Calculator/CalculatorInterface.php +++ b/src/Bundle/ChillBudgetBundle/Calculator/CalculatorInterface.php @@ -9,9 +9,9 @@ declare(strict_types=1); -namespace Chill\AMLI\BudgetBundle\Calculator; +namespace Chill\BudgetBundle\Calculator; -use Chill\AMLI\BudgetBundle\Entity\AbstractElement; +use Chill\BudgetBundle\Entity\AbstractElement; interface CalculatorInterface { diff --git a/src/Bundle/ChillBudgetBundle/Calculator/CalculatorManager.php b/src/Bundle/ChillBudgetBundle/Calculator/CalculatorManager.php index 0916b703c..21c9e18ca 100644 --- a/src/Bundle/ChillBudgetBundle/Calculator/CalculatorManager.php +++ b/src/Bundle/ChillBudgetBundle/Calculator/CalculatorManager.php @@ -9,9 +9,9 @@ declare(strict_types=1); -namespace Chill\AMLI\BudgetBundle\Calculator; +namespace Chill\BudgetBundle\Calculator; -use Chill\AMLI\BudgetBundle\Entity\AbstractElement; +use Chill\BudgetBundle\Entity\AbstractElement; use OutOfBoundsException; use function array_key_exists; diff --git a/src/Bundle/ChillBudgetBundle/Calculator/CalculatorResult.php b/src/Bundle/ChillBudgetBundle/Calculator/CalculatorResult.php index 7de147ffb..c3cc40008 100644 --- a/src/Bundle/ChillBudgetBundle/Calculator/CalculatorResult.php +++ b/src/Bundle/ChillBudgetBundle/Calculator/CalculatorResult.php @@ -9,7 +9,7 @@ declare(strict_types=1); -namespace Chill\AMLI\BudgetBundle\Calculator; +namespace Chill\BudgetBundle\Calculator; class CalculatorResult { diff --git a/src/Bundle/ChillBudgetBundle/ChillAMLIBudgetBundle.php b/src/Bundle/ChillBudgetBundle/ChillBudgetBundle.php similarity index 75% rename from src/Bundle/ChillBudgetBundle/ChillAMLIBudgetBundle.php rename to src/Bundle/ChillBudgetBundle/ChillBudgetBundle.php index add60c5df..ce8214604 100644 --- a/src/Bundle/ChillBudgetBundle/ChillAMLIBudgetBundle.php +++ b/src/Bundle/ChillBudgetBundle/ChillBudgetBundle.php @@ -9,12 +9,12 @@ declare(strict_types=1); -namespace Chill\AMLI\BudgetBundle; +namespace Chill\BudgetBundle; -use Chill\AMLI\BudgetBundle\DependencyInjection\Compiler\CalculatorCompilerPass; +use Chill\BudgetBundle\DependencyInjection\Compiler\CalculatorCompilerPass; use Symfony\Component\HttpKernel\Bundle\Bundle; -class ChillAMLIBudgetBundle extends Bundle +class ChillBudgetBundle extends Bundle { public function build(\Symfony\Component\DependencyInjection\ContainerBuilder $container) { diff --git a/src/Bundle/ChillBudgetBundle/Config/ConfigRepository.php b/src/Bundle/ChillBudgetBundle/Config/ConfigRepository.php index dc3ffe20d..7906e5821 100644 --- a/src/Bundle/ChillBudgetBundle/Config/ConfigRepository.php +++ b/src/Bundle/ChillBudgetBundle/Config/ConfigRepository.php @@ -9,7 +9,7 @@ declare(strict_types=1); -namespace Chill\AMLI\BudgetBundle\Config; +namespace Chill\BudgetBundle\Config; class ConfigRepository { diff --git a/src/Bundle/ChillBudgetBundle/Controller/AbstractElementController.php b/src/Bundle/ChillBudgetBundle/Controller/AbstractElementController.php index c8652e2e9..372d71635 100644 --- a/src/Bundle/ChillBudgetBundle/Controller/AbstractElementController.php +++ b/src/Bundle/ChillBudgetBundle/Controller/AbstractElementController.php @@ -9,10 +9,10 @@ declare(strict_types=1); -namespace Chill\AMLI\BudgetBundle\Controller; +namespace Chill\BudgetBundle\Controller; -use Chill\AMLI\BudgetBundle\Entity\AbstractElement; -use Chill\AMLI\BudgetBundle\Security\Authorization\BudgetElementVoter; +use Chill\BudgetBundle\Entity\AbstractElement; +use Chill\BudgetBundle\Security\Authorization\BudgetElementVoter; use Chill\PersonBundle\Entity\Person; use Doctrine\ORM\EntityManagerInterface; use Psr\Log\LoggerInterface; @@ -139,7 +139,7 @@ abstract class AbstractElementController extends Controller */ protected function _new(Person $person, Request $request, $template, $flashMessageOnSuccess) { - /** @var \Chill\AMLI\BudgetBundle\Entity\AbstractElement $element */ + /** @var \Chill\BudgetBundle\Entity\AbstractElement $element */ $element = $this->createNewElement() ->setPerson($person); diff --git a/src/Bundle/ChillBudgetBundle/Controller/ChargeController.php b/src/Bundle/ChillBudgetBundle/Controller/ChargeController.php index b06773609..8c6032c0c 100644 --- a/src/Bundle/ChillBudgetBundle/Controller/ChargeController.php +++ b/src/Bundle/ChillBudgetBundle/Controller/ChargeController.php @@ -9,10 +9,10 @@ declare(strict_types=1); -namespace Chill\AMLI\BudgetBundle\Controller; +namespace Chill\BudgetBundle\Controller; -use Chill\AMLI\BudgetBundle\Entity\Charge; -use Chill\AMLI\BudgetBundle\Form\ChargeType; +use Chill\BudgetBundle\Entity\Charge; +use Chill\BudgetBundle\Form\ChargeType; use Chill\PersonBundle\Entity\Person; use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route; use Symfony\Component\HttpFoundation\Request; @@ -32,7 +32,7 @@ class ChargeController extends AbstractElementController return $this->_delete( $charge, $request, - '@ChillAMLIBudget/Charge/confirm_delete.html.twig', + '@ChillBudget/Charge/confirm_delete.html.twig', 'Charge deleted' ); } @@ -50,7 +50,7 @@ class ChargeController extends AbstractElementController return $this->_edit( $charge, $request, - '@ChillAMLIBudget/Charge/edit.html.twig', + '@ChillBudget/Charge/edit.html.twig', 'Charge updated' ); } @@ -68,7 +68,7 @@ class ChargeController extends AbstractElementController return $this->_new( $person, $request, - '@ChillAMLIBudget/Charge/new.html.twig', + '@ChillBudget/Charge/new.html.twig', 'Charge created' ); } @@ -83,7 +83,7 @@ class ChargeController extends AbstractElementController */ public function viewAction(Charge $charge) { - return $this->_view($charge, '@ChillAMLIBudget/Charge/view.html.twig'); + return $this->_view($charge, '@ChillBudget/Charge/view.html.twig'); } protected function createNewElement() diff --git a/src/Bundle/ChillBudgetBundle/Controller/ElementController.php b/src/Bundle/ChillBudgetBundle/Controller/ElementController.php index 3a22e321f..62369b95a 100644 --- a/src/Bundle/ChillBudgetBundle/Controller/ElementController.php +++ b/src/Bundle/ChillBudgetBundle/Controller/ElementController.php @@ -9,12 +9,12 @@ declare(strict_types=1); -namespace Chill\AMLI\BudgetBundle\Controller; +namespace Chill\BudgetBundle\Controller; -use Chill\AMLI\BudgetBundle\Calculator\CalculatorManager; -use Chill\AMLI\BudgetBundle\Entity\Charge; -use Chill\AMLI\BudgetBundle\Entity\Resource; -use Chill\AMLI\BudgetBundle\Security\Authorization\BudgetElementVoter; +use Chill\BudgetBundle\Calculator\CalculatorManager; +use Chill\BudgetBundle\Entity\Charge; +use Chill\BudgetBundle\Entity\Resource; +use Chill\BudgetBundle\Security\Authorization\BudgetElementVoter; use Chill\PersonBundle\Entity\Person; use DateTime; use Doctrine\ORM\EntityManagerInterface; @@ -92,7 +92,7 @@ class ElementController extends Controller $results = $this->calculator->calculateDefault($elements); } - return $this->render('ChillAMLIBudgetBundle:Element:index.html.twig', [ + return $this->render('ChillBudgetBundle:Element:index.html.twig', [ 'person' => $person, 'charges' => $charges, 'resources' => $ressources, diff --git a/src/Bundle/ChillBudgetBundle/Controller/ResourceController.php b/src/Bundle/ChillBudgetBundle/Controller/ResourceController.php index 4ee8bd082..a5780157c 100644 --- a/src/Bundle/ChillBudgetBundle/Controller/ResourceController.php +++ b/src/Bundle/ChillBudgetBundle/Controller/ResourceController.php @@ -9,10 +9,10 @@ declare(strict_types=1); -namespace Chill\AMLI\BudgetBundle\Controller; +namespace Chill\BudgetBundle\Controller; -use Chill\AMLI\BudgetBundle\Entity\Resource; -use Chill\AMLI\BudgetBundle\Form\ResourceType; +use Chill\BudgetBundle\Entity\Resource; +use Chill\BudgetBundle\Form\ResourceType; use Chill\PersonBundle\Entity\Person; use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route; use Symfony\Component\HttpFoundation\Request; @@ -32,7 +32,7 @@ class ResourceController extends AbstractElementController return $this->_delete( $resource, $request, - '@ChillAMLIBudget/Resource/confirm_delete.html.twig', + '@ChillBudget/Resource/confirm_delete.html.twig', 'Resource deleted' ); } @@ -50,7 +50,7 @@ class ResourceController extends AbstractElementController return $this->_edit( $resource, $request, - '@ChillAMLIBudget/Resource/edit.html.twig', + '@ChillBudget/Resource/edit.html.twig', 'Resource updated' ); } @@ -68,7 +68,7 @@ class ResourceController extends AbstractElementController return $this->_new( $person, $request, - '@ChillAMLIBudget/Resource/new.html.twig', + '@ChillBudget/Resource/new.html.twig', 'Resource created' ); } @@ -83,7 +83,7 @@ class ResourceController extends AbstractElementController */ public function viewAction(Resource $resource) { - return $this->_view($resource, '@ChillAMLIBudget/Resource/view.html.twig'); + return $this->_view($resource, '@ChillBudget/Resource/view.html.twig'); } protected function createNewElement() diff --git a/src/Bundle/ChillBudgetBundle/DependencyInjection/ChillAMLIBudgetExtension.php b/src/Bundle/ChillBudgetBundle/DependencyInjection/ChillBudgetExtension.php similarity index 88% rename from src/Bundle/ChillBudgetBundle/DependencyInjection/ChillAMLIBudgetExtension.php rename to src/Bundle/ChillBudgetBundle/DependencyInjection/ChillBudgetExtension.php index bea107131..ce8021479 100644 --- a/src/Bundle/ChillBudgetBundle/DependencyInjection/ChillAMLIBudgetExtension.php +++ b/src/Bundle/ChillBudgetBundle/DependencyInjection/ChillBudgetExtension.php @@ -9,9 +9,9 @@ declare(strict_types=1); -namespace Chill\AMLI\BudgetBundle\DependencyInjection; +namespace Chill\BudgetBundle\DependencyInjection; -use Chill\AMLI\BudgetBundle\Security\Authorization\BudgetElementVoter; +use Chill\BudgetBundle\Security\Authorization\BudgetElementVoter; use Symfony\Component\Config\FileLocator; use Symfony\Component\DependencyInjection\ContainerBuilder; use Symfony\Component\DependencyInjection\Extension\PrependExtensionInterface; @@ -23,11 +23,11 @@ use Symfony\Component\HttpKernel\DependencyInjection\Extension; * * @see http://symfony.com/doc/current/cookbook/bundles/extension.html */ -class ChillAMLIBudgetExtension extends Extension implements PrependExtensionInterface +class ChillBudgetExtension extends Extension implements PrependExtensionInterface { public function load(array $configs, ContainerBuilder $container) { - $configuration = new Configuration(); + $configuration = $this->getConfiguration($configs, $container); $config = $this->processConfiguration($configuration, $configs); $loader = new Loader\YamlFileLoader($container, new FileLocator(__DIR__ . '/../config')); @@ -58,7 +58,7 @@ class ChillAMLIBudgetExtension extends Extension implements PrependExtensionInte $container->prependExtensionConfig('chill_main', [ 'routing' => [ 'resources' => [ - '@ChillAMLIBudgetBundle/config/routing.yaml', + '@ChillBudgetBundle/config/routing.yaml', ], ], ]); diff --git a/src/Bundle/ChillBudgetBundle/DependencyInjection/Compiler/CalculatorCompilerPass.php b/src/Bundle/ChillBudgetBundle/DependencyInjection/Compiler/CalculatorCompilerPass.php index 0a53e5160..ec47d5faa 100644 --- a/src/Bundle/ChillBudgetBundle/DependencyInjection/Compiler/CalculatorCompilerPass.php +++ b/src/Bundle/ChillBudgetBundle/DependencyInjection/Compiler/CalculatorCompilerPass.php @@ -9,7 +9,7 @@ declare(strict_types=1); -namespace Chill\AMLI\BudgetBundle\DependencyInjection\Compiler; +namespace Chill\BudgetBundle\DependencyInjection\Compiler; use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface; use Symfony\Component\DependencyInjection\ContainerBuilder; @@ -19,7 +19,7 @@ class CalculatorCompilerPass implements CompilerPassInterface { public function process(ContainerBuilder $container) { - $manager = $container->getDefinition('Chill\AMLI\BudgetBundle\Calculator\CalculatorManager'); + $manager = $container->getDefinition('Chill\BudgetBundle\Calculator\CalculatorManager'); foreach ($container->findTaggedServiceIds('chill_budget.calculator') as $id => $tags) { foreach ($tags as $tag) { diff --git a/src/Bundle/ChillBudgetBundle/DependencyInjection/Configuration.php b/src/Bundle/ChillBudgetBundle/DependencyInjection/Configuration.php index 407be6bff..fd7034f2d 100644 --- a/src/Bundle/ChillBudgetBundle/DependencyInjection/Configuration.php +++ b/src/Bundle/ChillBudgetBundle/DependencyInjection/Configuration.php @@ -9,7 +9,7 @@ declare(strict_types=1); -namespace Chill\AMLI\BudgetBundle\DependencyInjection; +namespace Chill\BudgetBundle\DependencyInjection; use Symfony\Component\Config\Definition\Builder\TreeBuilder; use Symfony\Component\Config\Definition\ConfigurationInterface; @@ -23,8 +23,8 @@ class Configuration implements ConfigurationInterface { public function getConfigTreeBuilder() { - $treeBuilder = new TreeBuilder('chill_amli_budget'); - $rootNode = $treeBuilder->getRootNode('chill_amli_budget'); + $treeBuilder = new TreeBuilder('chill_budget'); + $rootNode = $treeBuilder->getRootNode('chill_budget'); $rootNode ->children() diff --git a/src/Bundle/ChillBudgetBundle/Entity/AbstractElement.php b/src/Bundle/ChillBudgetBundle/Entity/AbstractElement.php index 5f43c4262..d2fbe9560 100644 --- a/src/Bundle/ChillBudgetBundle/Entity/AbstractElement.php +++ b/src/Bundle/ChillBudgetBundle/Entity/AbstractElement.php @@ -9,7 +9,7 @@ declare(strict_types=1); -namespace Chill\AMLI\BudgetBundle\Entity; +namespace Chill\BudgetBundle\Entity; use Chill\PersonBundle\Entity\Person; use DateTime; diff --git a/src/Bundle/ChillBudgetBundle/Entity/Charge.php b/src/Bundle/ChillBudgetBundle/Entity/Charge.php index e893f99af..6ac76a8c0 100644 --- a/src/Bundle/ChillBudgetBundle/Entity/Charge.php +++ b/src/Bundle/ChillBudgetBundle/Entity/Charge.php @@ -9,7 +9,7 @@ declare(strict_types=1); -namespace Chill\AMLI\BudgetBundle\Entity; +namespace Chill\BudgetBundle\Entity; use Chill\MainBundle\Entity\HasCenterInterface; use DateTimeImmutable; @@ -19,7 +19,7 @@ use Doctrine\ORM\Mapping as ORM; * Charge. * * @ORM\Table(name="chill_budget.charge") - * @ORM\Entity(repositoryClass="Chill\AMLI\BudgetBundle\Repository\ChargeRepository") + * @ORM\Entity(repositoryClass="Chill\BudgetBundle\Repository\ChargeRepository") */ class Charge extends AbstractElement implements HasCenterInterface { diff --git a/src/Bundle/ChillBudgetBundle/Entity/Resource.php b/src/Bundle/ChillBudgetBundle/Entity/Resource.php index bd13e0dd0..c0bf95b65 100644 --- a/src/Bundle/ChillBudgetBundle/Entity/Resource.php +++ b/src/Bundle/ChillBudgetBundle/Entity/Resource.php @@ -9,7 +9,7 @@ declare(strict_types=1); -namespace Chill\AMLI\BudgetBundle\Entity; +namespace Chill\BudgetBundle\Entity; use Chill\MainBundle\Entity\HasCenterInterface; use DateTimeImmutable; @@ -19,7 +19,7 @@ use Doctrine\ORM\Mapping as ORM; * Resource. * * @ORM\Table(name="chill_budget.resource") - * @ORM\Entity(repositoryClass="Chill\AMLI\BudgetBundle\Repository\ResourceRepository") + * @ORM\Entity(repositoryClass="Chill\BudgetBundle\Repository\ResourceRepository") */ class Resource extends AbstractElement implements HasCenterInterface { diff --git a/src/Bundle/ChillBudgetBundle/Form/ChargeType.php b/src/Bundle/ChillBudgetBundle/Form/ChargeType.php index 96aea3ea4..a13b0d4c4 100644 --- a/src/Bundle/ChillBudgetBundle/Form/ChargeType.php +++ b/src/Bundle/ChillBudgetBundle/Form/ChargeType.php @@ -9,10 +9,10 @@ declare(strict_types=1); -namespace Chill\AMLI\BudgetBundle\Form; +namespace Chill\BudgetBundle\Form; -use Chill\AMLI\BudgetBundle\Config\ConfigRepository; -use Chill\AMLI\BudgetBundle\Entity\Charge; +use Chill\BudgetBundle\Config\ConfigRepository; +use Chill\BudgetBundle\Entity\Charge; use Chill\MainBundle\Form\Type\ChillDateType; use Chill\MainBundle\Templating\TranslatableStringHelperInterface; use Symfony\Component\Form\AbstractType; @@ -96,7 +96,7 @@ class ChargeType extends AbstractType public function getBlockPrefix() { - return 'chill_amli_budgetbundle_charge'; + return 'chill_budgetbundle_charge'; } private function getTypes() diff --git a/src/Bundle/ChillBudgetBundle/Form/ResourceType.php b/src/Bundle/ChillBudgetBundle/Form/ResourceType.php index 9f772648d..10f2d8677 100644 --- a/src/Bundle/ChillBudgetBundle/Form/ResourceType.php +++ b/src/Bundle/ChillBudgetBundle/Form/ResourceType.php @@ -9,10 +9,10 @@ declare(strict_types=1); -namespace Chill\AMLI\BudgetBundle\Form; +namespace Chill\BudgetBundle\Form; -use Chill\AMLI\BudgetBundle\Config\ConfigRepository; -use Chill\AMLI\BudgetBundle\Entity\Resource; +use Chill\BudgetBundle\Config\ConfigRepository; +use Chill\BudgetBundle\Entity\Resource; use Chill\MainBundle\Form\Type\ChillDateType; use Chill\MainBundle\Templating\TranslatableStringHelperInterface; use Symfony\Component\Form\AbstractType; @@ -80,7 +80,7 @@ class ResourceType extends AbstractType public function getBlockPrefix() { - return 'chill_amli_budgetbundle_resource'; + return 'chill_budgetbundle_resource'; } private function getTypes() diff --git a/src/Bundle/ChillBudgetBundle/Menu/UserMenuBuilder.php b/src/Bundle/ChillBudgetBundle/Menu/UserMenuBuilder.php index f5dc02266..d4395314d 100644 --- a/src/Bundle/ChillBudgetBundle/Menu/UserMenuBuilder.php +++ b/src/Bundle/ChillBudgetBundle/Menu/UserMenuBuilder.php @@ -9,9 +9,9 @@ declare(strict_types=1); -namespace Chill\AMLI\BudgetBundle\Menu; +namespace Chill\BudgetBundle\Menu; -use Chill\AMLI\BudgetBundle\Security\Authorization\BudgetElementVoter; +use Chill\BudgetBundle\Security\Authorization\BudgetElementVoter; use Chill\MainBundle\Routing\LocalMenuBuilderInterface; use Knp\Menu\MenuItem; use Symfony\Component\Security\Core\Authorization\AuthorizationCheckerInterface; diff --git a/src/Bundle/ChillBudgetBundle/Repository/ChargeRepository.php b/src/Bundle/ChillBudgetBundle/Repository/ChargeRepository.php index 56f21b6fb..957b0dd77 100644 --- a/src/Bundle/ChillBudgetBundle/Repository/ChargeRepository.php +++ b/src/Bundle/ChillBudgetBundle/Repository/ChargeRepository.php @@ -9,7 +9,7 @@ declare(strict_types=1); -namespace Chill\AMLI\BudgetBundle\Repository; +namespace Chill\BudgetBundle\Repository; use Chill\PersonBundle\Entity\Person; use DateTime; diff --git a/src/Bundle/ChillBudgetBundle/Repository/ResourceRepository.php b/src/Bundle/ChillBudgetBundle/Repository/ResourceRepository.php index f7440a281..a9cb958f0 100644 --- a/src/Bundle/ChillBudgetBundle/Repository/ResourceRepository.php +++ b/src/Bundle/ChillBudgetBundle/Repository/ResourceRepository.php @@ -9,7 +9,7 @@ declare(strict_types=1); -namespace Chill\AMLI\BudgetBundle\Repository; +namespace Chill\BudgetBundle\Repository; use Chill\PersonBundle\Entity\Person; use DateTime; diff --git a/src/Bundle/ChillBudgetBundle/Resources/views/Charge/view.html.twig b/src/Bundle/ChillBudgetBundle/Resources/views/Charge/view.html.twig index d939fe81a..17f9fcb00 100644 --- a/src/Bundle/ChillBudgetBundle/Resources/views/Charge/view.html.twig +++ b/src/Bundle/ChillBudgetBundle/Resources/views/Charge/view.html.twig @@ -43,7 +43,7 @@ {{ 'Back to the list'|trans }} - {% if is_granted(constant('Chill\\AMLI\\BudgetBundle\\Security\\Authorization\\BudgetElementVoter::UPDATE'), element) %} + {% if is_granted(constant('Chill\\BudgetBundle\\Security\\Authorization\\BudgetElementVoter::UPDATE'), element) %}
  • {{ 'Edit'|trans }}
    • diff --git a/src/Bundle/ChillBudgetBundle/Resources/views/Element/index.html.twig b/src/Bundle/ChillBudgetBundle/Resources/views/Element/index.html.twig index aaca4c7ac..ba009ef29 100644 --- a/src/Bundle/ChillBudgetBundle/Resources/views/Element/index.html.twig +++ b/src/Bundle/ChillBudgetBundle/Resources/views/Element/index.html.twig @@ -66,17 +66,17 @@