Migrate project to the AceEditorBundle\AceEditorBundle namespace (fixes #74)

README.md

@@ -30,7 +30,7 @@ bundle yourself:
 
 return [
     // ...
-    Norzechowicz\AceEditorBundle\NorzechowiczAceEditorBundle::class => ['all' => true],
+    AceEditorBundle\AceEditorBundle::class => ['all' => true],
     // ...
 }
 ```
@@ -51,9 +51,9 @@ rm v1.2.6.tar.gz
 ## Usage
 
 ```php
-use Norzechowicz\AceEditorBundle\Form\Extension\AceEditor\Type\AceEditorType;
+use AceEditorBundle\Form\Extension\AceEditor\Type\AceEditorType;
 
-/* @var $builder \Symfony\Component\Form\FormBuilderInterface */
+/** @var $builder \Symfony\Component\Form\FormBuilderInterface */
 $builder->add('description', AceEditorType::class, array(
     'wrapper_attr' => array(), // aceeditor wrapper html attributes.
     'width' => '100%',
@@ -87,7 +87,7 @@ Default configuration:
 ```
 # app/config/config.yml
 
-norzechowicz_ace_editor:
+ace_editor:
     base_path: "vendor/ace" # notice! this is starting from your project's public web root, typically: `%kernel.project_dir%/public`!
     autoinclude: true
     debug: false # sources not minified, based on kernel.debug but it can force it
@@ -97,6 +97,6 @@ norzechowicz_ace_editor:
 You can also include Ace editor directly from a location that follow the same directory layout than
 `https://github.com/ajaxorg/ace-builds`, all you need to do is setting `base_path` option:
 ```
-norzechowicz_ace_editor:
+ace_editor:
     base_path: "http://rawgithub.com/ajaxorg/ace-builds/master"
 ```

composer.json

@@ -22,11 +22,11 @@
         "phpunit/phpunit": "^9.2"
     },
     "autoload": {
-        "psr-4": { "Norzechowicz\\AceEditorBundle\\": "src/" }
+        "psr-4": { "AceEditorBundle\\": "src/" }
     },
     "autoload-dev": {
         "psr-4": {
-            "Norzechowicz\\AceEditorBundle\\Tests\\": "tests/"
+            "AceEditorBundle\\Tests\\": "tests/"
         }
     },
     "extra": {

src/NorzechowiczAceEditorBundle.php → src/AceEditorBundle.php

@@ -2,13 +2,13 @@
 
 declare(strict_types=1);
 
-namespace Norzechowicz\AceEditorBundle;
+namespace AceEditorBundle;
 
-use Norzechowicz\AceEditorBundle\DependencyInjection\Compiler\TwigFormPass;
+use AceEditorBundle\DependencyInjection\Compiler\TwigFormPass;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\HttpKernel\Bundle\Bundle;
 
-class NorzechowiczAceEditorBundle extends Bundle
+class AceEditorBundle extends Bundle
 {
     public function build(ContainerBuilder $container): void
     {

src/DependencyInjection/NorzechowiczAceEditorExtension.php → src/DependencyInjection/AceEditorExtension.php

@@ -2,14 +2,14 @@
 
 declare(strict_types=1);
 
-namespace Norzechowicz\AceEditorBundle\DependencyInjection;
+namespace AceEditorBundle\DependencyInjection;
 
 use Symfony\Component\Config\FileLocator;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Loader;
 use Symfony\Component\HttpKernel\DependencyInjection\Extension;
 
-class NorzechowiczAceEditorExtension extends Extension
+class AceEditorExtension extends Extension
 {
     public function load(array $configs, ContainerBuilder $container): void
     {
@@ -36,8 +36,8 @@ private function registerAceEditorParameters(array $config, ContainerBuilder $co
 
         $mode = 'src'.($debug ? '' : '-min').($config['noconflict'] ? '-noconflict' : '');
 
-        $container->setParameter('norzechowicz_ace_editor.options.autoinclude', $config['autoinclude']);
-        $container->setParameter('norzechowicz_ace_editor.options.base_path', $config['base_path']);
-        $container->setParameter('norzechowicz_ace_editor.options.mode', $mode);
+        $container->setParameter('ace_editor.options.autoinclude', $config['autoinclude']);
+        $container->setParameter('ace_editor.options.base_path', $config['base_path']);
+        $container->setParameter('ace_editor.options.mode', $mode);
     }
 }

src/DependencyInjection/Compiler/TwigFormPass.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Norzechowicz\AceEditorBundle\DependencyInjection\Compiler;
+namespace AceEditorBundle\DependencyInjection\Compiler;
 
 use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
@@ -16,7 +16,7 @@ public function process(ContainerBuilder $container): void
         }
 
         $container->setParameter('twig.form.resources', array_merge(
-            [$container->getParameter('norzechowicz_ace_editor.form.resource')],
+            [$container->getParameter('ace_editor.form.resource')],
             $container->getParameter('twig.form.resources')
         ));
     }

src/DependencyInjection/Configuration.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Norzechowicz\AceEditorBundle\DependencyInjection;
+namespace AceEditorBundle\DependencyInjection;
 
 use Symfony\Component\Config\Definition\Builder\TreeBuilder;
 use Symfony\Component\Config\Definition\ConfigurationInterface;
@@ -11,7 +11,7 @@ class Configuration implements ConfigurationInterface
 {
     public function getConfigTreeBuilder(): TreeBuilder
     {
-        $treeBuilder = new TreeBuilder('norzechowicz_ace_editor');
+        $treeBuilder = new TreeBuilder('ace_editor');
         $rootNode = $treeBuilder->getRootNode();
 
         $rootNode

src/Form/Extension/AceEditor/Type/AceEditorType.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Norzechowicz\AceEditorBundle\Form\Extension\AceEditor\Type;
+namespace AceEditorBundle\Form\Extension\AceEditor\Type;
 
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\Exception\InvalidArgumentException;

src/Resources/config/form.xml

@@ -4,10 +4,10 @@
     xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
 
     <parameters>
-        <parameter key="norzechowicz_ace_editor.form.resource">@NorzechowiczAceEditor/Form/div_layout.html.twig</parameter>
+        <parameter key="ace_editor.form.resource">@NorbertTechSymfonyAceEditor/Form/div_layout.html.twig</parameter>
     </parameters>
     <services>
-        <service id="norzechowicz_ace_editor.form.type.ace_editor" class="Norzechowicz\AceEditorBundle\Form\Extension\AceEditor\Type\AceEditorType">
+        <service id="ace_editor.form.type.ace_editor" class="AceEditorBundle\Form\Extension\AceEditor\Type\AceEditorType">
             <tag name="form.type" alias="ace_editor" />
         </service>
     </services>

src/Resources/config/twig.xml

@@ -4,11 +4,11 @@
            xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
     <services>
         <!-- Twig Extensions -->
-        <service id="norzechowicz_ace_editor.twig.form_extension" class="Norzechowicz\AceEditorBundle\Twig\Extension\AceEditorExtension">
+        <service id="ace_editor.twig.form_extension" class="AceEditorBundle\Twig\Extension\AceEditorExtension">
             <tag name="twig.extension" />
-            <argument>%norzechowicz_ace_editor.options.autoinclude%</argument>
-            <argument>%norzechowicz_ace_editor.options.base_path%</argument>
-            <argument>%norzechowicz_ace_editor.options.mode%</argument>
+            <argument>%ace_editor.options.autoinclude%</argument>
+            <argument>%ace_editor.options.base_path%</argument>
+            <argument>%ace_editor.options.mode%</argument>
         </service>
     </services>
 </container>

src/Twig/Extension/AceEditorExtension.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Norzechowicz\AceEditorBundle\Twig\Extension;
+namespace AceEditorBundle\Twig\Extension;
 
 use Symfony\Bridge\Twig\Extension\AssetExtension;
 use Twig\Environment;

tests/NorzechowiczAceEditorBundleTest.php → tests/AceEditorBundleTest.php

@@ -2,19 +2,19 @@
 
 declare(strict_types=1);
 
-namespace Norzechowicz\AceEditorBundle\Tests;
+namespace AceEditorBundle\Tests;
 
-use Norzechowicz\AceEditorBundle\DependencyInjection\Compiler\TwigFormPass;
-use Norzechowicz\AceEditorBundle\NorzechowiczAceEditorBundle;
+use AceEditorBundle\AceEditorBundle;
+use AceEditorBundle\DependencyInjection\Compiler\TwigFormPass;
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 
-class NorzechowiczAceEditorBundleTest extends TestCase
+class AceEditorBundleTest extends TestCase
 {
     public function testBuild(): void
     {
         $container = new ContainerBuilder();
-        $bundle = new NorzechowiczAceEditorBundle();
+        $bundle = new AceEditorBundle();
         $bundle->build($container);
 
         $this->assertNotEmpty(array_filter(

tests/DependencyInjection/NorzechowiczEditorExtensionTest.php → tests/DependencyInjection/AceEditorExtensionTest.php

@@ -2,30 +2,30 @@
 
 declare(strict_types=1);
 
-namespace Norzechowicz\AceEditorBundle\Tests\DependencyInjection;
+namespace AceEditorBundle\Tests\DependencyInjection;
 
-use Norzechowicz\AceEditorBundle\DependencyInjection\NorzechowiczAceEditorExtension;
+use AceEditorBundle\DependencyInjection\AceEditorExtension;
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 
-class NorzechowiczEditorExtensionTest extends TestCase
+class AceEditorExtensionTest extends TestCase
 {
     /**
      * @dataProvider loadProvider
      */
     public function testLoad(array $parameters, bool $kernelDebug, array $expected): void
     {
-        $extension = new NorzechowiczAceEditorExtension();
+        $extension = new AceEditorExtension();
         $container = new ContainerBuilder();
 
         $container->setParameter('kernel.debug', $kernelDebug);
 
         $extension->load([$parameters], $container);
 
         $result = [
-            'autoinclude' => $container->getParameter('norzechowicz_ace_editor.options.autoinclude'),
-            'base_path' => $container->getParameter('norzechowicz_ace_editor.options.base_path'),
-            'mode' => $container->getParameter('norzechowicz_ace_editor.options.mode'),
+            'autoinclude' => $container->getParameter('ace_editor.options.autoinclude'),
+            'base_path' => $container->getParameter('ace_editor.options.base_path'),
+            'mode' => $container->getParameter('ace_editor.options.mode'),
         ];
 
         $this->assertSame($expected, $result);

tests/DependencyInjection/Compiler/TwigFormPassTest.php

@@ -2,9 +2,9 @@
 
 declare(strict_types=1);
 
-namespace Norzechowicz\AceEditorBundle\Tests\DependencyInjection\Compiler;
+namespace AceEditorBundle\Tests\DependencyInjection\Compiler;
 
-use Norzechowicz\AceEditorBundle\DependencyInjection\Compiler\TwigFormPass;
+use AceEditorBundle\DependencyInjection\Compiler\TwigFormPass;
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\Config\FileLocator;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
@@ -36,7 +36,7 @@ public function testProcessHasTwigFormResources(): void
         $compiler->process($container);
 
         $this->assertSame(
-            ['@NorzechowiczAceEditor/Form/div_layout.html.twig', 'foo'],
+            ['@NorbertTechSymfonyAceEditor/Form/div_layout.html.twig', 'foo'],
             $container->getParameter('twig.form.resources')
         );
     }

tests/DependencyInjection/ConfigurationTest.php

@@ -2,9 +2,9 @@
 
 declare(strict_types=1);
 
-namespace Norzechowicz\AceEditorBundle\Tests\DependencyInjection;
+namespace AceEditorBundle\Tests\DependencyInjection;
 
-use Norzechowicz\AceEditorBundle\DependencyInjection\Configuration;
+use AceEditorBundle\DependencyInjection\Configuration;
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\Config\Definition\Processor;
 

tests/Form/Extension/AceEditor/Type/AceEditorTypeTest.php

@@ -2,9 +2,9 @@
 
 declare(strict_types=1);
 
-namespace Norzechowicz\AceEditorBundle\Tests\Form\Extension\AceEditor\Type;
+namespace AceEditorBundle\Tests\Form\Extension\AceEditor\Type;
 
-use Norzechowicz\AceEditorBundle\Form\Extension\AceEditor\Type\AceEditorType;
+use AceEditorBundle\Form\Extension\AceEditor\Type\AceEditorType;
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\Form\Extension\Core\Type\TextareaType;
 use Symfony\Component\OptionsResolver\OptionsResolver;

tests/Twig/Extension/AceEditorExtensionTest.php

@@ -2,9 +2,9 @@
 
 declare(strict_types=1);
 
-namespace Norzechowicz\AceEditorBundle\Tests\Twig\Extension;
+namespace AceEditorBundle\Tests\Twig\Extension;
 
-use Norzechowicz\AceEditorBundle\Twig\Extension\AceEditorExtension;
+use AceEditorBundle\Twig\Extension\AceEditorExtension;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 use Symfony\Bridge\Twig\Extension\AssetExtension;