prepare subtree split for a standalone library

.gitignore

@@ -4,7 +4,6 @@
 /composer-install.bat
 /composer-update.bat
 /composer.lock
-.DS_Store
 /git.bat
 /phpunit-tests-run-with-coverage.bat
 /phpunit-tests-run.bat
@@ -14,3 +13,4 @@
 /vendors-install.bat
 /vendors-update.bat
 /vendors-whatsnew.bat
+.DS_Store

CraueFormFlowBundle.php

@@ -2,7 +2,9 @@
 
 namespace Craue\FormFlowBundle;
 
-use Craue\FormFlowBundle\Util\TempFileUtil;
+use Craue\FormFlowBundle\DependencyInjection\Compiler\LoadTranslationsCompilerPass;
+use Craue\FormFlowBundle\FormFlow\Util\TempFileUtil;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\HttpKernel\Bundle\Bundle;
 
 /**
@@ -25,4 +27,12 @@ public function boot() {
 		});
 	}
 
+	/**
+	 * {@inheritDoc}
+	 */
+	public function build(ContainerBuilder $container) {
+		parent::build($container);
+		$container->addCompilerPass(new LoadTranslationsCompilerPass());
+	}
+
 }

DependencyInjection/Compiler/LoadTranslationsCompilerPass.php

@@ -0,0 +1,45 @@
+<?php
+
+namespace Craue\FormFlowBundle\DependencyInjection\Compiler;
+
+use Symfony\Component\Config\Resource\DirectoryResource;
+use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\Finder\Finder;
+
+/**
+ * Explicitly registers translation files in their uncommon location.
+ *
+ * @author Christian Raue <[email protected]>
+ * @copyright 2011-2015 Christian Raue
+ * @license http://opensource.org/licenses/mit-license.php MIT License
+ */
+class LoadTranslationsCompilerPass implements CompilerPassInterface {
+
+	/**
+	 * {@inheritDoc}
+	 */
+	public function process(ContainerBuilder $container) {
+		$dir = __DIR__ . '/../../FormFlow/Resources/translations';
+
+		// taken roughly from https://github.com/symfony/symfony/blob/ce15db564736d7a0cf02a0db688a0ee101959cb5/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php#L650
+		$container->addResource(new DirectoryResource($dir));
+
+		$finder = Finder::create()
+			->files()
+			->in($dir)
+			->filter(function (\SplFileInfo $file) {
+				$basename = $file->getBasename();
+				return substr_count($basename, '.') === 2 && preg_match('/\.\w+$/', $basename);
+			})
+		;
+
+		$translator = $container->findDefinition('translator');
+
+		foreach ($finder as $file) {
+			list($domain, $locale, $format) = explode('.', $file->getBasename(), 3);
+			$translator->addMethodCall('addResource', array($format, (string) $file, $locale, $domain));
+		}
+	}
+
+}

FormFlow/.gitignore

@@ -0,0 +1,6 @@
+/.buildpath
+/.project
+/.settings
+/git-subtree-split.bat
+/git.bat
+.DS_Store

Event/FormFlowEvent.php → FormFlow/Event/FormFlowEvent.php

@@ -1,8 +1,8 @@
 <?php
 
-namespace Craue\FormFlowBundle\Event;
+namespace Craue\FormFlowBundle\FormFlow\Event;
 
-use Craue\FormFlowBundle\Form\FormFlowInterface;
+use Craue\FormFlowBundle\FormFlow\FormFlowInterface;
 use Symfony\Component\EventDispatcher\Event;
 
 /**

Event/GetStepsEvent.php → FormFlow/Event/GetStepsEvent.php

@@ -1,8 +1,8 @@
 <?php
 
-namespace Craue\FormFlowBundle\Event;
+namespace Craue\FormFlowBundle\FormFlow\Event;
 
-use Craue\FormFlowBundle\Form\StepInterface;
+use Craue\FormFlowBundle\FormFlow\StepInterface;
 
 /**
  * Is called once to define steps for the flow.

Event/PostBindFlowEvent.php → FormFlow/Event/PostBindFlowEvent.php

@@ -1,8 +1,8 @@
 <?php
 
-namespace Craue\FormFlowBundle\Event;
+namespace Craue\FormFlowBundle\FormFlow\Event;
 
-use Craue\FormFlowBundle\Form\FormFlowInterface;
+use Craue\FormFlowBundle\FormFlow\FormFlowInterface;
 
 /**
  * Is called once after binding all step's saved form data and determining the current step.

Event/PostBindRequestEvent.php → FormFlow/Event/PostBindRequestEvent.php

@@ -1,8 +1,8 @@
 <?php
 
-namespace Craue\FormFlowBundle\Event;
+namespace Craue\FormFlowBundle\FormFlow\Event;
 
-use Craue\FormFlowBundle\Form\FormFlowInterface;
+use Craue\FormFlowBundle\FormFlow\FormFlowInterface;
 
 /**
  * Is called once for the current step after binding the request.

Event/PostBindSavedDataEvent.php → FormFlow/Event/PostBindSavedDataEvent.php

@@ -1,8 +1,8 @@
 <?php
 
-namespace Craue\FormFlowBundle\Event;
+namespace Craue\FormFlowBundle\FormFlow\Event;
 
-use Craue\FormFlowBundle\Form\FormFlowInterface;
+use Craue\FormFlowBundle\FormFlow\FormFlowInterface;
 
 /**
  * Is called for each step after binding its saved form data.

Event/PostValidateEvent.php → FormFlow/Event/PostValidateEvent.php

@@ -1,8 +1,8 @@
 <?php
 
-namespace Craue\FormFlowBundle\Event;
+namespace Craue\FormFlowBundle\FormFlow\Event;
 
-use Craue\FormFlowBundle\Form\FormFlowInterface;
+use Craue\FormFlowBundle\FormFlow\FormFlowInterface;
 
 /**
  * Is called once for the current step after validating the form data.

Event/PreBindEvent.php → FormFlow/Event/PreBindEvent.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Craue\FormFlowBundle\Event;
+namespace Craue\FormFlowBundle\FormFlow\Event;
 
 /**
  * Is called once prior to binding any (neither saved nor request) data.

Event/PreviousStepInvalidEvent.php → FormFlow/Event/PreviousStepInvalidEvent.php

@@ -1,8 +1,8 @@
 <?php
 
-namespace Craue\FormFlowBundle\Event;
+namespace Craue\FormFlowBundle\FormFlow\Event;
 
-use Craue\FormFlowBundle\Form\FormFlowInterface;
+use Craue\FormFlowBundle\FormFlow\FormFlowInterface;
 use Symfony\Component\Form\FormInterface;
 
 /**

EventListener/PreviousStepInvalidEventListener.php → FormFlow/EventListener/PreviousStepInvalidEventListener.php

@@ -1,8 +1,8 @@
 <?php
 
-namespace Craue\FormFlowBundle\EventListener;
+namespace Craue\FormFlowBundle\FormFlow\EventListener;
 
-use Craue\FormFlowBundle\Event\PreviousStepInvalidEvent;
+use Craue\FormFlowBundle\FormFlow\Event\PreviousStepInvalidEvent;
 use Symfony\Component\Form\FormError;
 use Symfony\Component\Translation\TranslatorInterface;
 

Exception/InvalidTypeException.php → FormFlow/Exception/InvalidTypeException.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Craue\FormFlowBundle\Exception;
+namespace Craue\FormFlowBundle\FormFlow\Exception;
 
 /**
  * @author Christian Raue <[email protected]>

Form/Extension/FormFlowFormExtension.php → FormFlow/Extension/FormFlowFormExtension.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Craue\FormFlowBundle\Form\Extension;
+namespace Craue\FormFlowBundle\FormFlow\Extension;
 
 use Symfony\Component\Form\AbstractTypeExtension;
 use Symfony\Component\Form\FormBuilderInterface;

Form/Extension/FormFlowHiddenFieldExtension.php → FormFlow/Extension/FormFlowHiddenFieldExtension.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Craue\FormFlowBundle\Form\Extension;
+namespace Craue\FormFlowBundle\FormFlow\Extension;
 
 use Symfony\Component\Form\AbstractTypeExtension;
 use Symfony\Component\Form\FormInterface;

Form/FormFlow.php → FormFlow/FormFlow.php

@@ -1,17 +1,17 @@
 <?php
 
-namespace Craue\FormFlowBundle\Form;
-
-use Craue\FormFlowBundle\Event\GetStepsEvent;
-use Craue\FormFlowBundle\Event\PostBindFlowEvent;
-use Craue\FormFlowBundle\Event\PostBindRequestEvent;
-use Craue\FormFlowBundle\Event\PostBindSavedDataEvent;
-use Craue\FormFlowBundle\Event\PostValidateEvent;
-use Craue\FormFlowBundle\Event\PreBindEvent;
-use Craue\FormFlowBundle\Event\PreviousStepInvalidEvent;
-use Craue\FormFlowBundle\Exception\InvalidTypeException;
-use Craue\FormFlowBundle\Storage\DataManagerInterface;
-use Craue\FormFlowBundle\Util\StringUtil;
+namespace Craue\FormFlowBundle\FormFlow;
+
+use Craue\FormFlowBundle\FormFlow\Event\GetStepsEvent;
+use Craue\FormFlowBundle\FormFlow\Event\PostBindFlowEvent;
+use Craue\FormFlowBundle\FormFlow\Event\PostBindRequestEvent;
+use Craue\FormFlowBundle\FormFlow\Event\PostBindSavedDataEvent;
+use Craue\FormFlowBundle\FormFlow\Event\PostValidateEvent;
+use Craue\FormFlowBundle\FormFlow\Event\PreBindEvent;
+use Craue\FormFlowBundle\FormFlow\Event\PreviousStepInvalidEvent;
+use Craue\FormFlowBundle\FormFlow\Exception\InvalidTypeException;
+use Craue\FormFlowBundle\FormFlow\Storage\DataManagerInterface;
+use Craue\FormFlowBundle\FormFlow\Util\StringUtil;
 use Symfony\Component\EventDispatcher\EventDispatcherInterface;
 use Symfony\Component\Form\FormFactoryInterface;
 use Symfony\Component\Form\FormInterface;

Form/FormFlowEvents.php → FormFlow/FormFlowEvents.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Craue\FormFlowBundle\Form;
+namespace Craue\FormFlowBundle\FormFlow;
 
 /**
  * @author Marcus Stöhr <[email protected]>

Form/FormFlowInterface.php → FormFlow/FormFlowInterface.php

@@ -1,9 +1,9 @@
 <?php
 
-namespace Craue\FormFlowBundle\Form;
+namespace Craue\FormFlowBundle\FormFlow;
 
-use Craue\FormFlowBundle\Exception\InvalidTypeException;
-use Craue\FormFlowBundle\Storage\DataManagerInterface;
+use Craue\FormFlowBundle\FormFlow\Exception\InvalidTypeException;
+use Craue\FormFlowBundle\FormFlow\Storage\DataManagerInterface;
 use Symfony\Component\EventDispatcher\EventDispatcherInterface;
 use Symfony\Component\Form\FormFactoryInterface;
 use Symfony\Component\Form\FormInterface;

FormFlow/LICENSE

@@ -0,0 +1,2 @@
+Copyright (c) 2011-2015 Christian Raue <[email protected]>
+Licensed under the MIT License: http://opensource.org/licenses/mit-license.php

FormFlow/README.md

@@ -0,0 +1 @@
+For further information refer to https://github.com/craue/CraueFormFlowBundle.

Form/Step.php → FormFlow/Step.php

@@ -1,8 +1,8 @@
 <?php
 
-namespace Craue\FormFlowBundle\Form;
+namespace Craue\FormFlowBundle\FormFlow;
 
-use Craue\FormFlowBundle\Exception\InvalidTypeException;
+use Craue\FormFlowBundle\FormFlow\Exception\InvalidTypeException;
 use Symfony\Component\Form\FormTypeInterface;
 
 /**

Form/StepInterface.php → FormFlow/StepInterface.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Craue\FormFlowBundle\Form;
+namespace Craue\FormFlowBundle\FormFlow;
 
 use Symfony\Component\Form\FormTypeInterface;
 

Storage/DataManager.php → FormFlow/Storage/DataManager.php

@@ -1,8 +1,8 @@
 <?php
 
-namespace Craue\FormFlowBundle\Storage;
+namespace Craue\FormFlowBundle\FormFlow\Storage;
 
-use Craue\FormFlowBundle\Form\FormFlowInterface;
+use Craue\FormFlowBundle\FormFlow\FormFlowInterface;
 
 /**
  * Manages data of flows and their steps.

Storage/DataManagerInterface.php → FormFlow/Storage/DataManagerInterface.php

@@ -1,8 +1,8 @@
 <?php
 
-namespace Craue\FormFlowBundle\Storage;
+namespace Craue\FormFlowBundle\FormFlow\Storage;
 
-use Craue\FormFlowBundle\Form\FormFlowInterface;
+use Craue\FormFlowBundle\FormFlow\FormFlowInterface;
 
 /**
  * @author Christian Raue <[email protected]>

Storage/ExtendedDataManagerInterface.php → FormFlow/Storage/ExtendedDataManagerInterface.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Craue\FormFlowBundle\Storage;
+namespace Craue\FormFlowBundle\FormFlow\Storage;
 
 /**
  * Extends the base {@link DataManagerInterface} by methods which may be used for custom flow management.

Storage/SerializableFile.php → FormFlow/Storage/SerializableFile.php

@@ -1,9 +1,9 @@
 <?php
 
-namespace Craue\FormFlowBundle\Storage;
+namespace Craue\FormFlowBundle\FormFlow\Storage;
 
-use Craue\FormFlowBundle\Exception\InvalidTypeException;
-use Craue\FormFlowBundle\Util\TempFileUtil;
+use Craue\FormFlowBundle\FormFlow\Exception\InvalidTypeException;
+use Craue\FormFlowBundle\FormFlow\Util\TempFileUtil;
 use Symfony\Component\HttpFoundation\File\UploadedFile;
 
 /**

Storage/SessionStorage.php → FormFlow/Storage/SessionStorage.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Craue\FormFlowBundle\Storage;
+namespace Craue\FormFlowBundle\FormFlow\Storage;
 
 use Symfony\Component\HttpFoundation\Session\SessionInterface;
 

Storage/StorageInterface.php → FormFlow/Storage/StorageInterface.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Craue\FormFlowBundle\Storage;
+namespace Craue\FormFlowBundle\FormFlow\Storage;
 
 /**
  * @author Toni Uebernickel <[email protected]>

Util/StringUtil.php → FormFlow/Util/StringUtil.php

@@ -1,8 +1,8 @@
 <?php
 
-namespace Craue\FormFlowBundle\Util;
+namespace Craue\FormFlowBundle\FormFlow\Util;
 
-use Craue\FormFlowBundle\Exception\InvalidTypeException;
+use Craue\FormFlowBundle\FormFlow\Exception\InvalidTypeException;
 
 /**
  * @author Christian Raue <[email protected]>

Util/TempFileUtil.php → FormFlow/Util/TempFileUtil.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Craue\FormFlowBundle\Util;
+namespace Craue\FormFlowBundle\FormFlow\Util;
 
 /**
  * Keeps track of temporary files to be able to remove them when no longer needed.