Revert "updated namespace"

Christian Hessel · Christian Hessel · commit 35d796abbc66 · 2015-10-14T10:44:51.000+02:00
This reverts commit e131c10.
diff --git a/Command/BaseBootstrapSymlinkCommand.php b/Command/BaseBootstrapSymlinkCommand.php
@@ -7,7 +7,7 @@
  * file that was distributed with this source code.
  */
 
-namespace opwoco\BootstrapBundle\Command;
+namespace opwoco\Bundle\BootstrapBundle\Command;
 
 use Mopa\Bridge\Composer\Adapter\ComposerAdapter;
 use Mopa\Bridge\Composer\Util\ComposerPathFinder;
diff --git a/Command/BootstrapSymlinkLessCommand.php b/Command/BootstrapSymlinkLessCommand.php
@@ -7,7 +7,7 @@
  * file that was distributed with this source code.
  */
 
-namespace opwoco\BootstrapBundle\Command;
+namespace opwoco\Bundle\BootstrapBundle\Command;
 
 /**
  * Command to create Bootstrap symlink to OpwocoBootstrapBundle.
diff --git a/Command/BootstrapSymlinkSassCommand.php b/Command/BootstrapSymlinkSassCommand.php
@@ -7,7 +7,7 @@
  * file that was distributed with this source code.
  */
 
-namespace opwoco\BootstrapBundle\Command;
+namespace opwoco\Bundle\BootstrapBundle\Command;
 
 /**
  * Command to create Bootstrap (SASS) symlink to OpwocoBootstrapBundle.
diff --git a/Command/InstallFontsCommand.php b/Command/InstallFontsCommand.php
@@ -7,17 +7,19 @@
  * file that was distributed with this source code.
  */
 
-namespace opwoco\BootstrapBundle\Command;
+namespace opwoco\Bundle\BootstrapBundle\Command;
 
-use opwoco\BootstrapBundle\Constant\IconSet;
+use opwoco\Bundle\BootstrapBundle\Constant\IconSet;
 use Symfony\Bundle\FrameworkBundle\Command\ContainerAwareCommand;
+use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\OutputInterface;
 use Symfony\Component\Filesystem\Filesystem;
 use Symfony\Component\Finder\Finder;
 use Mopa\Bridge\Composer\Adapter\ComposerAdapter;
 use Mopa\Bridge\Composer\Util\ComposerPathFinder;
+use Symfony\Component\Validator\Constraints\Optional;
 
 /**
  * Command to create Bootstrap symlink to OpwocoBootstrapBundle.
diff --git a/Command/SyncFontsCommand.php b/Command/SyncFontsCommand.php
@@ -7,11 +7,11 @@
  * file that was distributed with this source code.
  */
 
-namespace opwoco\BootstrapBundle\Command;
+namespace opwoco\Bundle\BootstrapBundle\Command;
 
 use Mopa\Bridge\Composer\Adapter\ComposerAdapter;
 use Mopa\Bridge\Composer\Util\ComposerPathFinder;
-use opwoco\BootstrapBundle\Constant\IconSet;
+use opwoco\Bundle\BootstrapBundle\Constant\IconSet;
 use Sabberworm\CSS\CSSList\Document;
 use Symfony\Bundle\FrameworkBundle\Command\ContainerAwareCommand;
 use Symfony\Component\Console\Input\InputInterface;
diff --git a/Composer/ScriptHandler.php b/Composer/ScriptHandler.php
@@ -7,12 +7,12 @@
  * file that was distributed with this source code.
  */
 
-namespace opwoco\BootstrapBundle\Composer;
+namespace opwoco\Bundle\BootstrapBundle\Composer;
 
 use Composer\Script\Event;
 use Mopa\Bridge\Composer\Util\ComposerPathFinder;
-use opwoco\BootstrapBundle\Command\BootstrapSymlinkLessCommand;
-use opwoco\BootstrapBundle\Command\BootstrapSymlinkSassCommand;
+use opwoco\Bundle\BootstrapBundle\Command\BootstrapSymlinkLessCommand;
+use opwoco\Bundle\BootstrapBundle\Command\BootstrapSymlinkSassCommand;
 
 /**
  * Script for Composer, create symlink to bootstrap lib into the BootstrapBundle.
diff --git a/Constant/IconSet.php b/Constant/IconSet.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace opwoco\BootstrapBundle\Constant;
+namespace opwoco\Bundle\BootstrapBundle\Constant;
 
 
 class IconSet
diff --git a/DependencyInjection/Compiler/FormPass.php b/DependencyInjection/Compiler/FormPass.php
@@ -7,7 +7,7 @@
  * file that was distributed with this source code.
  */
 
-namespace opwoco\BootstrapBundle\DependencyInjection\Compiler;
+namespace opwoco\Bundle\BootstrapBundle\DependencyInjection\Compiler;
 
 use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
diff --git a/DependencyInjection/Configuration.php b/DependencyInjection/Configuration.php
@@ -7,7 +7,7 @@
  * file that was distributed with this source code.
  */
 
-namespace opwoco\BootstrapBundle\DependencyInjection;
+namespace opwoco\Bundle\BootstrapBundle\DependencyInjection;
 
 use Symfony\Component\Config\Definition\Builder\ArrayNodeDefinition;
 use Symfony\Component\Config\Definition\Builder\TreeBuilder;
diff --git a/DependencyInjection/opwocoBootstrapExtension.php b/DependencyInjection/opwocoBootstrapExtension.php
@@ -7,7 +7,7 @@
  * file that was distributed with this source code.
  */
 
-namespace opwoco\BootstrapBundle\DependencyInjection;
+namespace opwoco\Bundle\BootstrapBundle\DependencyInjection;
 
 use Symfony\Component\Config\FileLocator;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
diff --git a/Entity/BootstrapIcon.php b/Entity/BootstrapIcon.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace opwoco\BootstrapBundle\Entity;
+namespace opwoco\Bundle\BootstrapBundle\Entity;
 
 use Doctrine\ORM\Mapping as ORM;
 
diff --git a/Entity/BootstrapIconRepository.php b/Entity/BootstrapIconRepository.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace opwoco\BootstrapBundle\Entity;
+namespace opwoco\Bundle\BootstrapBundle\Entity;
 
 use Doctrine\ORM\EntityRepository;
-use opwoco\BootstrapBundle\Constant\IconSet;
+use opwoco\Bundle\BootstrapBundle\Constant\IconSet;
 
 /**
  * BootstrapIconRepository
diff --git a/Form/Extension/DateTypeExtension.php b/Form/Extension/DateTypeExtension.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace opwoco\BootstrapBundle\Form\Extension;
+namespace opwoco\Bundle\BootstrapBundle\Form\Extension;
 
 use Symfony\Component\Form\AbstractTypeExtension;
 use Symfony\Component\Form\FormInterface;
diff --git a/Form/Extension/DatetimeTypeExtension.php b/Form/Extension/DatetimeTypeExtension.php
@@ -7,7 +7,7 @@
  * file that was distributed with this source code.
  */
 
-namespace opwoco\BootstrapBundle\Form\Extension;
+namespace opwoco\Bundle\BootstrapBundle\Form\Extension;
 
 use Symfony\Component\Form\AbstractTypeExtension;
 use Symfony\Component\Form\FormInterface;
diff --git a/Form/Extension/EmbedFormExtension.php b/Form/Extension/EmbedFormExtension.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace opwoco\BootstrapBundle\Form\Extension;
+namespace opwoco\Bundle\BootstrapBundle\Form\Extension;
 
 use Symfony\Component\OptionsResolver\OptionsResolver;
 use Symfony\Component\OptionsResolver\OptionsResolverInterface;
diff --git a/Form/Extension/ErrorTypeFormTypeExtension.php b/Form/Extension/ErrorTypeFormTypeExtension.php
@@ -7,7 +7,7 @@
  * file that was distributed with this source code.
  */
 
-namespace opwoco\BootstrapBundle\Form\Extension;
+namespace opwoco\Bundle\BootstrapBundle\Form\Extension;
 
 use Symfony\Component\Form\AbstractTypeExtension;
 use Symfony\Component\Form\FormInterface;
diff --git a/Form/Extension/HelpFormTypeExtension.php b/Form/Extension/HelpFormTypeExtension.php
@@ -7,7 +7,7 @@
  * file that was distributed with this source code.
  */
 
-namespace opwoco\BootstrapBundle\Form\Extension;
+namespace opwoco\Bundle\BootstrapBundle\Form\Extension;
 
 use Symfony\Component\Form\AbstractTypeExtension;
 use Symfony\Component\Form\Exception\InvalidArgumentException;
diff --git a/Form/Extension/HorizontalFormTypeExtension.php b/Form/Extension/HorizontalFormTypeExtension.php
@@ -7,7 +7,7 @@
  * file that was distributed with this source code.
  */
 
-namespace opwoco\BootstrapBundle\Form\Extension;
+namespace opwoco\Bundle\BootstrapBundle\Form\Extension;
 
 use Symfony\Component\Form\AbstractTypeExtension;
 use Symfony\Component\Form\FormInterface;
diff --git a/Form/Extension/IconButtonExtension.php b/Form/Extension/IconButtonExtension.php
@@ -7,7 +7,7 @@
  * file that was distributed with this source code.
  */
 
-namespace opwoco\BootstrapBundle\Form\Extension;
+namespace opwoco\Bundle\BootstrapBundle\Form\Extension;
 
 use Symfony\Component\Form\AbstractTypeExtension;
 use Symfony\Component\Form\FormInterface;
diff --git a/Form/Extension/LegendFormTypeExtension.php b/Form/Extension/LegendFormTypeExtension.php
@@ -7,7 +7,7 @@
  * file that was distributed with this source code.
  */
 
-namespace opwoco\BootstrapBundle\Form\Extension;
+namespace opwoco\Bundle\BootstrapBundle\Form\Extension;
 
 use Symfony\Component\Form\AbstractTypeExtension;
 use Symfony\Component\Form\FormInterface;
diff --git a/Form/Extension/OffsetButtonExtension.php b/Form/Extension/OffsetButtonExtension.php
@@ -7,7 +7,7 @@
  * file that was distributed with this source code.
  */
 
-namespace opwoco\BootstrapBundle\Form\Extension;
+namespace opwoco\Bundle\BootstrapBundle\Form\Extension;
 
 use Symfony\Component\Form\AbstractTypeExtension;
 use Symfony\Component\Form\FormInterface;
diff --git a/Form/Extension/StaticTextExtension.php b/Form/Extension/StaticTextExtension.php
@@ -7,7 +7,7 @@
  * file that was distributed with this source code.
  */
 
-namespace opwoco\BootstrapBundle\Form\Extension;
+namespace opwoco\Bundle\BootstrapBundle\Form\Extension;
 
 use Symfony\Component\Form\AbstractTypeExtension;
 use Symfony\Component\Form\FormInterface;
diff --git a/Form/Extension/TabbedFormTypeExtension.php b/Form/Extension/TabbedFormTypeExtension.php
@@ -7,7 +7,7 @@
  * file that was distributed with this source code.
  */
 
-namespace opwoco\BootstrapBundle\Form\Extension;
+namespace opwoco\Bundle\BootstrapBundle\Form\Extension;
 
 use Mopa\Bundle\BootstrapBundle\Form\Type\TabsType;
 use Symfony\Component\Form\AbstractTypeExtension;
diff --git a/Form/Extension/TimeTypeExtension.php b/Form/Extension/TimeTypeExtension.php
@@ -7,7 +7,7 @@
  * file that was distributed with this source code.
  */
 
-namespace opwoco\BootstrapBundle\Form\Extension;
+namespace opwoco\Bundle\BootstrapBundle\Form\Extension;
 
 use Symfony\Component\Form\AbstractTypeExtension;
 use Symfony\Component\Form\FormInterface;
diff --git a/Form/Extension/WidgetCollectionFormTypeExtension.php b/Form/Extension/WidgetCollectionFormTypeExtension.php
@@ -7,7 +7,7 @@
  * file that was distributed with this source code.
  */
 
-namespace opwoco\BootstrapBundle\Form\Extension;
+namespace opwoco\Bundle\BootstrapBundle\Form\Extension;
 
 use Symfony\Component\Form\AbstractTypeExtension;
 use Symfony\Component\Form\Exception\InvalidArgumentException;
diff --git a/Form/Extension/WidgetFormTypeExtension.php b/Form/Extension/WidgetFormTypeExtension.php
@@ -7,7 +7,7 @@
  * file that was distributed with this source code.
  */
 
-namespace opwoco\BootstrapBundle\Form\Extension;
+namespace opwoco\Bundle\BootstrapBundle\Form\Extension;
 
 use Symfony\Component\Form\AbstractTypeExtension;
 use Symfony\Component\Form\FormInterface;
diff --git a/Form/Type/FormActionsType.php b/Form/Type/FormActionsType.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace opwoco\BootstrapBundle\Form\Type;
+namespace opwoco\Bundle\BootstrapBundle\Form\Type;
 
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\ButtonBuilder;
@@ -15,7 +15,7 @@
  *
  * Adds support for form actions, printing buttons in a single line, and correctly offset.
  *
- * @package opwoco\BootstrapBundle\Form\Type
+ * @package opwoco\Bundle\BootstrapBundle\Form\Type
  */
 class FormActionsType extends AbstractType
 {
diff --git a/Form/Type/TabType.php b/Form/Type/TabType.php
@@ -7,7 +7,7 @@
  * file that was distributed with this source code.
  */
 
-namespace opwoco\BootstrapBundle\Form\Type;
+namespace opwoco\Bundle\BootstrapBundle\Form\Type;
 
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\FormInterface;
diff --git a/Form/Type/TabsType.php b/Form/Type/TabsType.php
@@ -7,7 +7,7 @@
  * file that was distributed with this source code.
  */
 
-namespace opwoco\BootstrapBundle\Form\Type;
+namespace opwoco\Bundle\BootstrapBundle\Form\Type;
 
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\FormInterface;
diff --git a/Menu/Converter/MenuConverter.php b/Menu/Converter/MenuConverter.php
@@ -7,9 +7,9 @@
  * file that was distributed with this source code.
  */
 
-namespace opwoco\BootstrapBundle\Menu\Converter;
+namespace opwoco\Bundle\BootstrapBundle\Menu\Converter;
 
-use opwoco\BootstrapBundle\Menu\Factory\MenuDecorator;
+use opwoco\Bundle\BootstrapBundle\Menu\Factory\MenuDecorator;
 use Knp\Menu\ItemInterface;
 
 /**
diff --git a/Menu/Factory/MenuDecorator.php b/Menu/Factory/MenuDecorator.php
@@ -7,7 +7,7 @@
  * file that was distributed with this source code.
  */
 
-namespace opwoco\BootstrapBundle\Menu\Factory;
+namespace opwoco\Bundle\BootstrapBundle\Menu\Factory;
 
 use Knp\Menu\ItemInterface;
 
diff --git a/Menu/Factory/MenuExtension.php b/Menu/Factory/MenuExtension.php
@@ -7,7 +7,7 @@
  * file that was distributed with this source code.
  */
 
-namespace opwoco\BootstrapBundle\Menu\Factory;
+namespace opwoco\Bundle\BootstrapBundle\Menu\Factory;
 
 use Knp\Menu\Factory\ExtensionInterface;
 
diff --git a/Resources/config/doctrine/BootstrapIcon.orm.yml b/Resources/config/doctrine/BootstrapIcon.orm.yml
@@ -1,7 +1,7 @@
-opwoco\BootstrapBundle\Entity\BootstrapIcon:
+opwoco\Bundle\BootstrapBundle\Entity\BootstrapIcon:
     type: entity
     table: opwoco_bootstrap_icons
-    repositoryClass: opwoco\BootstrapBundle\Entity\BootstrapIconRepository
+    repositoryClass: opwoco\Bundle\BootstrapBundle\Entity\BootstrapIconRepository
     fields:
         id:
             type: integer
diff --git a/Resources/config/form.yml b/Resources/config/form.yml
@@ -1,21 +1,21 @@
 parameters:
 
-    opwoco_bootstrap.form.type_extension.embed_form.class: opwoco\BootstrapBundle\Form\Extension\EmbedFormExtension
-    opwoco_bootstrap.form.type_extension.static_text.class: opwoco\BootstrapBundle\Form\Extension\StaticTextExtension
-    opwoco_bootstrap.form.type_extension.offset_button.class: opwoco\BootstrapBundle\Form\Extension\OffsetButtonExtension
-    opwoco_bootstrap.form.type_extension.button.class: opwoco\BootstrapBundle\Form\Extension\IconButtonExtension
-    opwoco_bootstrap.form.type_extension.help.class: opwoco\BootstrapBundle\Form\Extension\HelpFormTypeExtension
-    opwoco_bootstrap.form.type_extension.legend.class: opwoco\BootstrapBundle\Form\Extension\LegendFormTypeExtension
-    opwoco_bootstrap.form.type_extension.error.class: opwoco\BootstrapBundle\Form\Extension\ErrorTypeFormTypeExtension
-    opwoco_bootstrap.form.type_extension.widget.class: opwoco\BootstrapBundle\Form\Extension\WidgetFormTypeExtension
-    opwoco_bootstrap.form.type_extension.horizontal.class: opwoco\BootstrapBundle\Form\Extension\HorizontalFormTypeExtension
-    opwoco_bootstrap.form.type_extension.widget_collection.class: opwoco\BootstrapBundle\Form\Extension\WidgetCollectionFormTypeExtension
-    opwoco_bootstrap.form.type_extension.date.class: opwoco\BootstrapBundle\Form\Extension\DateTypeExtension
-    opwoco_bootstrap.form.type_extension.datetime.class: opwoco\BootstrapBundle\Form\Extension\DatetimeTypeExtension
-    opwoco_bootstrap.form.type_extension.time.class: opwoco\BootstrapBundle\Form\Extension\TimeTypeExtension
-    opwoco_bootstrap.form.type_extension.tabbed.class: opwoco\BootstrapBundle\Form\Extension\TabbedFormTypeExtension
-    opwoco_bootstrap.form.type.tab.class: opwoco\BootstrapBundle\Form\Type\TabType
-    opwoco_bootstrap.form.type.form_actions.class: opwoco\BootstrapBundle\Form\Type\FormActionsType
+    opwoco_bootstrap.form.type_extension.embed_form.class: opwoco\Bundle\BootstrapBundle\Form\Extension\EmbedFormExtension
+    opwoco_bootstrap.form.type_extension.static_text.class: opwoco\Bundle\BootstrapBundle\Form\Extension\StaticTextExtension
+    opwoco_bootstrap.form.type_extension.offset_button.class: opwoco\Bundle\BootstrapBundle\Form\Extension\OffsetButtonExtension
+    opwoco_bootstrap.form.type_extension.button.class: opwoco\Bundle\BootstrapBundle\Form\Extension\IconButtonExtension
+    opwoco_bootstrap.form.type_extension.help.class: opwoco\Bundle\BootstrapBundle\Form\Extension\HelpFormTypeExtension
+    opwoco_bootstrap.form.type_extension.legend.class: opwoco\Bundle\BootstrapBundle\Form\Extension\LegendFormTypeExtension
+    opwoco_bootstrap.form.type_extension.error.class: opwoco\Bundle\BootstrapBundle\Form\Extension\ErrorTypeFormTypeExtension
+    opwoco_bootstrap.form.type_extension.widget.class: opwoco\Bundle\BootstrapBundle\Form\Extension\WidgetFormTypeExtension
+    opwoco_bootstrap.form.type_extension.horizontal.class: opwoco\Bundle\BootstrapBundle\Form\Extension\HorizontalFormTypeExtension
+    opwoco_bootstrap.form.type_extension.widget_collection.class: opwoco\Bundle\BootstrapBundle\Form\Extension\WidgetCollectionFormTypeExtension
+    opwoco_bootstrap.form.type_extension.date.class: opwoco\Bundle\BootstrapBundle\Form\Extension\DateTypeExtension
+    opwoco_bootstrap.form.type_extension.datetime.class: opwoco\Bundle\BootstrapBundle\Form\Extension\DatetimeTypeExtension
+    opwoco_bootstrap.form.type_extension.time.class: opwoco\Bundle\BootstrapBundle\Form\Extension\TimeTypeExtension
+    opwoco_bootstrap.form.type_extension.tabbed.class: opwoco\Bundle\BootstrapBundle\Form\Extension\TabbedFormTypeExtension
+    opwoco_bootstrap.form.type.tab.class: opwoco\Bundle\BootstrapBundle\Form\Type\TabType
+    opwoco_bootstrap.form.type.form_actions.class: opwoco\Bundle\BootstrapBundle\Form\Type\FormActionsType
 
 services:
 
diff --git a/Resources/config/initializr.yml b/Resources/config/initializr.yml
@@ -1,6 +1,6 @@
 parameters:
 
-    opwoco_bootstrap.twig.extension.initializr.class: opwoco\BootstrapBundle\Twig\InitializrTwigExtension
+    opwoco_bootstrap.twig.extension.initializr.class: opwoco\Bundle\BootstrapBundle\Twig\InitializrTwigExtension
 
 
 services:
diff --git a/Resources/config/menu.yml b/Resources/config/menu.yml
@@ -1,7 +1,7 @@
 parameters:
 
-    opwoco_bootstrap.twig.extension.menu.class: opwoco\BootstrapBundle\Twig\MenuExtension
-    opwoco_bootstrap.menu.extension.class: opwoco\BootstrapBundle\Menu\Factory\MenuExtension
+    opwoco_bootstrap.twig.extension.menu.class: opwoco\Bundle\BootstrapBundle\Twig\MenuExtension
+    opwoco_bootstrap.menu.extension.class: opwoco\Bundle\BootstrapBundle\Menu\Factory\MenuExtension
 
 
 services:
diff --git a/Resources/config/twig.yml b/Resources/config/twig.yml
diff --git a/Resources/doc/extensions/4-support-for-other-bundles.md b/Resources/doc/extensions/4-support-for-other-bundles.md
diff --git a/Resources/doc/install/1-getting-started.md b/Resources/doc/install/1-getting-started.md
diff --git a/Resources/doc/misc/testing-forms.md b/Resources/doc/misc/testing-forms.md
diff --git a/Resources/doc/navbar-upgrade.md b/Resources/doc/navbar-upgrade.md
diff --git a/Tests/Form/AbstractDivLayoutTest.php b/Tests/Form/AbstractDivLayoutTest.php
diff --git a/Tests/Form/AddonLayoutTest.php b/Tests/Form/AddonLayoutTest.php
diff --git a/Tests/Form/LegendLayoutTest.php b/Tests/Form/LegendLayoutTest.php
diff --git a/Tests/Form/SimpleDivLayoutTest.php b/Tests/Form/SimpleDivLayoutTest.php
diff --git a/Tests/Form/TypeTestCase.php b/Tests/Form/TypeTestCase.php
diff --git a/Twig/FlashExtension.php b/Twig/FlashExtension.php
diff --git a/Twig/FormExtension.php b/Twig/FormExtension.php
diff --git a/Twig/IconExtension.php b/Twig/IconExtension.php
diff --git a/Twig/InitializrTwigExtension.php b/Twig/InitializrTwigExtension.php
diff --git a/Twig/MenuExtension.php b/Twig/MenuExtension.php
diff --git a/composer.json b/composer.json
diff --git a/opwocoBootstrapBundle.php b/opwocoBootstrapBundle.php
