refactor #143 Move some classes to Field namespace (sstok)

This PR was merged into the 2.0-dev branch. Discussion ---------- Commits ------- e9d583e Move some classes to Field namespace
rollerworks · Jan 28, 2017 · 5c980a9 · 5c980a9
2 parents 464adb2 + e9d583e
commit 5c980a9
Show file tree

Hide file tree

Showing 68 changed files with 131 additions and 91 deletions.
diff --git a/src/AbstractExtension.php b/src/AbstractExtension.php
@@ -15,6 +15,8 @@
 
 use Rollerworks\Component\Search\Exception\InvalidArgumentException;
 use Rollerworks\Component\Search\Exception\UnexpectedTypeException;
+use Rollerworks\Component\Search\Field\FieldType;
+use Rollerworks\Component\Search\Field\FieldTypeExtension;
 
 /**
  * The AbstractExtension can be used as a base class for SearchExtensions.

diff --git a/src/ConditionOptimizer/DuplicateRemover.php b/src/ConditionOptimizer/DuplicateRemover.php
@@ -13,7 +13,7 @@
 
 namespace Rollerworks\Component\Search\ConditionOptimizer;
 
-use Rollerworks\Component\Search\FieldConfig;
+use Rollerworks\Component\Search\Field\FieldConfig;
 use Rollerworks\Component\Search\FieldSet;
 use Rollerworks\Component\Search\SearchCondition;
 use Rollerworks\Component\Search\SearchConditionOptimizer;

diff --git a/src/ConditionOptimizer/RangeOptimizer.php b/src/ConditionOptimizer/RangeOptimizer.php
@@ -13,7 +13,7 @@
 
 namespace Rollerworks\Component\Search\ConditionOptimizer;
 
-use Rollerworks\Component\Search\FieldConfig;
+use Rollerworks\Component\Search\Field\FieldConfig;
 use Rollerworks\Component\Search\FieldSet;
 use Rollerworks\Component\Search\SearchCondition;
 use Rollerworks\Component\Search\SearchConditionOptimizer;

diff --git a/src/ConditionOptimizer/ValuesToRange.php b/src/ConditionOptimizer/ValuesToRange.php
@@ -13,7 +13,7 @@
 
 namespace Rollerworks\Component\Search\ConditionOptimizer;
 
-use Rollerworks\Component\Search\FieldConfig;
+use Rollerworks\Component\Search\Field\FieldConfig;
 use Rollerworks\Component\Search\FieldSet;
 use Rollerworks\Component\Search\SearchCondition;
 use Rollerworks\Component\Search\SearchConditionOptimizer;

diff --git a/src/Exporter/AbstractExporter.php b/src/Exporter/AbstractExporter.php
@@ -14,7 +14,7 @@
 namespace Rollerworks\Component\Search\Exporter;
 
 use Rollerworks\Component\Search\ConditionExporter;
-use Rollerworks\Component\Search\FieldConfig;
+use Rollerworks\Component\Search\Field\FieldConfig;
 use Rollerworks\Component\Search\FieldSet;
 use Rollerworks\Component\Search\SearchCondition;
 use Rollerworks\Component\Search\Value\PatternMatch;

diff --git a/src/Exporter/ArrayExporter.php b/src/Exporter/ArrayExporter.php
@@ -13,7 +13,7 @@
 
 namespace Rollerworks\Component\Search\Exporter;
 
-use Rollerworks\Component\Search\FieldConfig;
+use Rollerworks\Component\Search\Field\FieldConfig;
 use Rollerworks\Component\Search\FieldSet;
 use Rollerworks\Component\Search\Value\Compare;
 use Rollerworks\Component\Search\Value\ExcludedRange;

diff --git a/src/Exporter/StringQueryExporter.php b/src/Exporter/StringQueryExporter.php
@@ -14,7 +14,7 @@
 namespace Rollerworks\Component\Search\Exporter;
 
 use Rollerworks\Component\Search\Exception\UnknownFieldException;
-use Rollerworks\Component\Search\FieldConfig;
+use Rollerworks\Component\Search\Field\FieldConfig;
 use Rollerworks\Component\Search\FieldSet;
 use Rollerworks\Component\Search\SearchCondition;
 use Rollerworks\Component\Search\Value\Compare;

diff --git a/src/Exporter/XmlExporter.php b/src/Exporter/XmlExporter.php
@@ -13,7 +13,7 @@
 
 namespace Rollerworks\Component\Search\Exporter;
 
-use Rollerworks\Component\Search\FieldConfig;
+use Rollerworks\Component\Search\Field\FieldConfig;
 use Rollerworks\Component\Search\FieldSet;
 use Rollerworks\Component\Search\SearchCondition;
 use Rollerworks\Component\Search\Value\Compare;

diff --git a/src/Extension/Core/Type/BaseDateTimeType.php b/src/Extension/Core/Type/BaseDateTimeType.php
@@ -13,8 +13,8 @@
 
 namespace Rollerworks\Component\Search\Extension\Core\Type;
 
-use Rollerworks\Component\Search\AbstractFieldType;
 use Rollerworks\Component\Search\Exception\InvalidConfigurationException;
+use Rollerworks\Component\Search\Field\AbstractFieldType;
 use Rollerworks\Component\Search\ValueComparator;
 
 /**

diff --git a/src/Extension/Core/Type/BirthdayType.php b/src/Extension/Core/Type/BirthdayType.php
@@ -13,11 +13,11 @@
 
 namespace Rollerworks\Component\Search\Extension\Core\Type;
 
-use Rollerworks\Component\Search\AbstractFieldType;
 use Rollerworks\Component\Search\Extension\Core\DataTransformer\BirthdayTransformer;
 use Rollerworks\Component\Search\Extension\Core\DataTransformer\LocalizedBirthdayTransformer;
-use Rollerworks\Component\Search\FieldConfig;
-use Rollerworks\Component\Search\SearchFieldView;
+use Rollerworks\Component\Search\Field\AbstractFieldType;
+use Rollerworks\Component\Search\Field\FieldConfig;
+use Rollerworks\Component\Search\Field\SearchFieldView;
 use Rollerworks\Component\Search\Value\Compare;
 use Rollerworks\Component\Search\Value\Range;
 use Rollerworks\Component\Search\ValueComparator;

diff --git a/src/Extension/Core/Type/ChoiceType.php b/src/Extension/Core/Type/ChoiceType.php
@@ -13,7 +13,6 @@
 
 namespace Rollerworks\Component\Search\Extension\Core\Type;
 
-use Rollerworks\Component\Search\AbstractFieldType;
 use Rollerworks\Component\Search\Extension\Core\ChoiceList\ChoiceList;
 use Rollerworks\Component\Search\Extension\Core\ChoiceList\Factory\CachingFactoryDecorator;
 use Rollerworks\Component\Search\Extension\Core\ChoiceList\Factory\ChoiceListFactory;
@@ -23,8 +22,9 @@
 use Rollerworks\Component\Search\Extension\Core\ChoiceList\View\ChoiceListView;
 use Rollerworks\Component\Search\Extension\Core\DataTransformer\ChoiceToLabelTransformer;
 use Rollerworks\Component\Search\Extension\Core\DataTransformer\ChoiceToValueTransformer;
-use Rollerworks\Component\Search\FieldConfig;
-use Rollerworks\Component\Search\SearchFieldView;
+use Rollerworks\Component\Search\Field\AbstractFieldType;
+use Rollerworks\Component\Search\Field\FieldConfig;
+use Rollerworks\Component\Search\Field\SearchFieldView;
 use Symfony\Component\OptionsResolver\Options;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 use Symfony\Component\PropertyAccess\PropertyPath;

diff --git a/src/Extension/Core/Type/CountryType.php b/src/Extension/Core/Type/CountryType.php
@@ -13,10 +13,10 @@
 
 namespace Rollerworks\Component\Search\Extension\Core\Type;
 
-use Rollerworks\Component\Search\AbstractFieldType;
 use Rollerworks\Component\Search\Extension\Core\ChoiceList\ArrayChoiceList;
 use Rollerworks\Component\Search\Extension\Core\ChoiceList\ChoiceList;
 use Rollerworks\Component\Search\Extension\Core\ChoiceList\Loader\ChoiceLoader;
+use Rollerworks\Component\Search\Field\AbstractFieldType;
 use Symfony\Component\Intl\Intl;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 

diff --git a/src/Extension/Core/Type/CurrencyType.php b/src/Extension/Core/Type/CurrencyType.php
@@ -13,10 +13,10 @@
 
 namespace Rollerworks\Component\Search\Extension\Core\Type;
 
-use Rollerworks\Component\Search\AbstractFieldType;
 use Rollerworks\Component\Search\Extension\Core\ChoiceList\ArrayChoiceList;
 use Rollerworks\Component\Search\Extension\Core\ChoiceList\ChoiceList;
 use Rollerworks\Component\Search\Extension\Core\ChoiceList\Loader\ChoiceLoader;
+use Rollerworks\Component\Search\Field\AbstractFieldType;
 use Symfony\Component\Intl\Intl;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 

diff --git a/src/Extension/Core/Type/DateTimeType.php b/src/Extension/Core/Type/DateTimeType.php
@@ -15,8 +15,8 @@
 
 use Rollerworks\Component\Search\Extension\Core\DataTransformer\DateTimeToLocalizedStringTransformer;
 use Rollerworks\Component\Search\Extension\Core\DataTransformer\DateTimeToRfc3339Transformer;
-use Rollerworks\Component\Search\FieldConfig;
-use Rollerworks\Component\Search\SearchFieldView;
+use Rollerworks\Component\Search\Field\FieldConfig;
+use Rollerworks\Component\Search\Field\SearchFieldView;
 use Rollerworks\Component\Search\Value\Compare;
 use Rollerworks\Component\Search\Value\Range;
 use Symfony\Component\OptionsResolver\OptionsResolver;

diff --git a/src/Extension/Core/Type/DateType.php b/src/Extension/Core/Type/DateType.php
@@ -14,8 +14,8 @@
 namespace Rollerworks\Component\Search\Extension\Core\Type;
 
 use Rollerworks\Component\Search\Extension\Core\DataTransformer\DateTimeToLocalizedStringTransformer;
-use Rollerworks\Component\Search\FieldConfig;
-use Rollerworks\Component\Search\SearchFieldView;
+use Rollerworks\Component\Search\Field\FieldConfig;
+use Rollerworks\Component\Search\Field\SearchFieldView;
 use Rollerworks\Component\Search\Value\Compare;
 use Rollerworks\Component\Search\Value\Range;
 use Symfony\Component\OptionsResolver\OptionsResolver;

diff --git a/src/Extension/Core/Type/IntegerType.php b/src/Extension/Core/Type/IntegerType.php
@@ -13,11 +13,11 @@
 
 namespace Rollerworks\Component\Search\Extension\Core\Type;
 
-use Rollerworks\Component\Search\AbstractFieldType;
 use Rollerworks\Component\Search\Extension\Core\DataTransformer\IntegerToLocalizedStringTransformer;
 use Rollerworks\Component\Search\Extension\Core\DataTransformer\IntegerToStringTransformer;
-use Rollerworks\Component\Search\FieldConfig;
-use Rollerworks\Component\Search\SearchFieldView;
+use Rollerworks\Component\Search\Field\AbstractFieldType;
+use Rollerworks\Component\Search\Field\FieldConfig;
+use Rollerworks\Component\Search\Field\SearchFieldView;
 use Rollerworks\Component\Search\Value\Compare;
 use Rollerworks\Component\Search\Value\Range;
 use Rollerworks\Component\Search\ValueComparator;

diff --git a/src/Extension/Core/Type/LanguageType.php b/src/Extension/Core/Type/LanguageType.php
@@ -13,10 +13,10 @@
 
 namespace Rollerworks\Component\Search\Extension\Core\Type;
 
-use Rollerworks\Component\Search\AbstractFieldType;
 use Rollerworks\Component\Search\Extension\Core\ChoiceList\ArrayChoiceList;
 use Rollerworks\Component\Search\Extension\Core\ChoiceList\ChoiceList;
 use Rollerworks\Component\Search\Extension\Core\ChoiceList\Loader\ChoiceLoader;
+use Rollerworks\Component\Search\Field\AbstractFieldType;
 use Symfony\Component\Intl\Intl;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 

diff --git a/src/Extension/Core/Type/LocaleType.php b/src/Extension/Core/Type/LocaleType.php
@@ -13,10 +13,10 @@
 
 namespace Rollerworks\Component\Search\Extension\Core\Type;
 
-use Rollerworks\Component\Search\AbstractFieldType;
 use Rollerworks\Component\Search\Extension\Core\ChoiceList\ArrayChoiceList;
 use Rollerworks\Component\Search\Extension\Core\ChoiceList\ChoiceList;
 use Rollerworks\Component\Search\Extension\Core\ChoiceList\Loader\ChoiceLoader;
+use Rollerworks\Component\Search\Field\AbstractFieldType;
 use Symfony\Component\Intl\Intl;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 

diff --git a/src/Extension/Core/Type/MoneyType.php b/src/Extension/Core/Type/MoneyType.php
@@ -13,11 +13,11 @@
 
 namespace Rollerworks\Component\Search\Extension\Core\Type;
 
-use Rollerworks\Component\Search\AbstractFieldType;
 use Rollerworks\Component\Search\Extension\Core\DataTransformer\MoneyToLocalizedStringTransformer;
 use Rollerworks\Component\Search\Extension\Core\DataTransformer\MoneyToStringTransformer;
-use Rollerworks\Component\Search\FieldConfig;
-use Rollerworks\Component\Search\SearchFieldView;
+use Rollerworks\Component\Search\Field\AbstractFieldType;
+use Rollerworks\Component\Search\Field\FieldConfig;
+use Rollerworks\Component\Search\Field\SearchFieldView;
 use Rollerworks\Component\Search\Value\Compare;
 use Rollerworks\Component\Search\Value\Range;
 use Rollerworks\Component\Search\ValueComparator;

diff --git a/src/Extension/Core/Type/NumberType.php b/src/Extension/Core/Type/NumberType.php
@@ -13,11 +13,11 @@
 
 namespace Rollerworks\Component\Search\Extension\Core\Type;
 
-use Rollerworks\Component\Search\AbstractFieldType;
 use Rollerworks\Component\Search\Extension\Core\DataTransformer\NumberToLocalizedStringTransformer;
 use Rollerworks\Component\Search\Extension\Core\DataTransformer\NumberToStringTransformer;
-use Rollerworks\Component\Search\FieldConfig;
-use Rollerworks\Component\Search\SearchFieldView;
+use Rollerworks\Component\Search\Field\AbstractFieldType;
+use Rollerworks\Component\Search\Field\FieldConfig;
+use Rollerworks\Component\Search\Field\SearchFieldView;
 use Rollerworks\Component\Search\Value\Compare;
 use Rollerworks\Component\Search\Value\Range;
 use Rollerworks\Component\Search\ValueComparator;

diff --git a/src/Extension/Core/Type/SearchFieldType.php b/src/Extension/Core/Type/SearchFieldType.php
@@ -13,8 +13,8 @@
 
 namespace Rollerworks\Component\Search\Extension\Core\Type;
 
-use Rollerworks\Component\Search\AbstractFieldType;
-use Rollerworks\Component\Search\FieldConfig;
+use Rollerworks\Component\Search\Field\AbstractFieldType;
+use Rollerworks\Component\Search\Field\FieldConfig;
 use Rollerworks\Component\Search\ValueComparator;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 

diff --git a/src/Extension/Core/Type/TextType.php b/src/Extension/Core/Type/TextType.php
@@ -13,8 +13,8 @@
 
 namespace Rollerworks\Component\Search\Extension\Core\Type;
 
-use Rollerworks\Component\Search\AbstractFieldType;
-use Rollerworks\Component\Search\FieldConfig;
+use Rollerworks\Component\Search\Field\AbstractFieldType;
+use Rollerworks\Component\Search\Field\FieldConfig;
 use Rollerworks\Component\Search\Value\PatternMatch;
 
 /**

diff --git a/src/Extension/Core/Type/TimeType.php b/src/Extension/Core/Type/TimeType.php
@@ -13,11 +13,11 @@
 
 namespace Rollerworks\Component\Search\Extension\Core\Type;
 
-use Rollerworks\Component\Search\AbstractFieldType;
 use Rollerworks\Component\Search\Exception\InvalidConfigurationException;
 use Rollerworks\Component\Search\Extension\Core\DataTransformer\DateTimeToStringTransformer;
-use Rollerworks\Component\Search\FieldConfig;
-use Rollerworks\Component\Search\SearchFieldView;
+use Rollerworks\Component\Search\Field\AbstractFieldType;
+use Rollerworks\Component\Search\Field\FieldConfig;
+use Rollerworks\Component\Search\Field\SearchFieldView;
 use Rollerworks\Component\Search\Value\Compare;
 use Rollerworks\Component\Search\Value\Range;
 use Rollerworks\Component\Search\ValueComparator;

diff --git a/src/Extension/Core/Type/TimestampType.php b/src/Extension/Core/Type/TimestampType.php
@@ -13,9 +13,9 @@
 
 namespace Rollerworks\Component\Search\Extension\Core\Type;
 
-use Rollerworks\Component\Search\AbstractFieldType;
 use Rollerworks\Component\Search\Extension\Core\DataTransformer\DateTimeToTimestampTransformer;
-use Rollerworks\Component\Search\FieldConfig;
+use Rollerworks\Component\Search\Field\AbstractFieldType;
+use Rollerworks\Component\Search\Field\FieldConfig;
 use Rollerworks\Component\Search\Value\Compare;
 use Rollerworks\Component\Search\Value\Range;
 use Rollerworks\Component\Search\ValueComparator;

diff --git a/src/Extension/Core/Type/TimezoneType.php b/src/Extension/Core/Type/TimezoneType.php
@@ -13,10 +13,10 @@
 
 namespace Rollerworks\Component\Search\Extension\Core\Type;
 
-use Rollerworks\Component\Search\AbstractFieldType;
 use Rollerworks\Component\Search\Extension\Core\ChoiceList\ArrayChoiceList;
 use Rollerworks\Component\Search\Extension\Core\ChoiceList\ChoiceList;
 use Rollerworks\Component\Search\Extension\Core\ChoiceList\Loader\ChoiceLoader;
+use Rollerworks\Component\Search\Field\AbstractFieldType;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 
 /**

diff --git a/src/AbstractFieldType.php → src/Field/AbstractFieldType.php b/src/AbstractFieldType.php → src/Field/AbstractFieldType.php
@@ -11,7 +11,7 @@
  * with this source code in the file LICENSE.
  */
 
-namespace Rollerworks\Component\Search;
+namespace Rollerworks\Component\Search\Field;
 
 use Rollerworks\Component\Search\Extension\Core\Type\SearchFieldType;
 use Symfony\Component\OptionsResolver\OptionsResolver;

diff --git a/src/AbstractFieldTypeExtension.php → src/Field/AbstractFieldTypeExtension.php b/src/AbstractFieldTypeExtension.php → src/Field/AbstractFieldTypeExtension.php
@@ -11,7 +11,7 @@
  * with this source code in the file LICENSE.
  */
 
-namespace Rollerworks\Component\Search;
+namespace Rollerworks\Component\Search\Field;
 
 use Symfony\Component\OptionsResolver\OptionsResolver;
 

diff --git a/src/FieldConfig.php → src/Field/FieldConfig.php b/src/FieldConfig.php → src/Field/FieldConfig.php
@@ -11,7 +11,11 @@
  * with this source code in the file LICENSE.
  */
 
-namespace Rollerworks\Component\Search;
+namespace Rollerworks\Component\Search\Field;
+
+use Rollerworks\Component\Search\DataTransformer;
+use Rollerworks\Component\Search\FieldSetView;
+use Rollerworks\Component\Search\ValueComparator;
 
 /**
  * The configuration of a SearchField.

diff --git a/src/FieldType.php → src/Field/FieldType.php b/src/FieldType.php → src/Field/FieldType.php
@@ -11,7 +11,7 @@
  * with this source code in the file LICENSE.
  */
 
-namespace Rollerworks\Component\Search;
+namespace Rollerworks\Component\Search\Field;
 
 use Symfony\Component\OptionsResolver\OptionsResolver;
 

diff --git a/src/FieldTypeExtension.php → src/Field/FieldTypeExtension.php b/src/FieldTypeExtension.php → src/Field/FieldTypeExtension.php
@@ -11,7 +11,7 @@
  * with this source code in the file LICENSE.
  */
 
-namespace Rollerworks\Component\Search;
+namespace Rollerworks\Component\Search\Field;
 
 use Symfony\Component\OptionsResolver\OptionsResolver;
 

diff --git a/src/GenericResolvedFieldType.php → src/Field/GenericResolvedFieldType.php b/src/GenericResolvedFieldType.php → src/Field/GenericResolvedFieldType.php
@@ -11,9 +11,10 @@
  * with this source code in the file LICENSE.
  */
 
-namespace Rollerworks\Component\Search;
+namespace Rollerworks\Component\Search\Field;
 
 use Rollerworks\Component\Search\Exception\UnexpectedTypeException;
+use Rollerworks\Component\Search\FieldSetView;
 use Rollerworks\Component\Search\Value\Compare;
 use Rollerworks\Component\Search\Value\PatternMatch;
 use Rollerworks\Component\Search\Value\Range;

diff --git a/src/GenericResolvedFieldTypeFactory.php → ...Field/GenericResolvedFieldTypeFactory.php b/src/GenericResolvedFieldTypeFactory.php → ...Field/GenericResolvedFieldTypeFactory.php
@@ -11,7 +11,7 @@
  * with this source code in the file LICENSE.
  */
 
-namespace Rollerworks\Component\Search;
+namespace Rollerworks\Component\Search\Field;
 
 class GenericResolvedFieldTypeFactory implements ResolvedFieldTypeFactory
 {

diff --git a/src/GenericTypeRegistry.php → src/Field/GenericTypeRegistry.php b/src/GenericTypeRegistry.php → src/Field/GenericTypeRegistry.php
@@ -11,11 +11,12 @@
  * with this source code in the file LICENSE.
  */
 
-namespace Rollerworks\Component\Search;
+namespace Rollerworks\Component\Search\Field;
 
 use Rollerworks\Component\Search\Exception\InvalidArgumentException;
 use Rollerworks\Component\Search\Exception\SearchException;
 use Rollerworks\Component\Search\Exception\UnexpectedTypeException;
+use Rollerworks\Component\Search\SearchExtension;
 
 /**
  * @author Sebastiaan Stok <s.stok@rollerscapes.net>

diff --git a/src/ResolvedFieldType.php → src/Field/ResolvedFieldType.php b/src/ResolvedFieldType.php → src/Field/ResolvedFieldType.php
@@ -11,8 +11,9 @@
  * with this source code in the file LICENSE.
  */
 
-namespace Rollerworks\Component\Search;
+namespace Rollerworks\Component\Search\Field;
 
+use Rollerworks\Component\Search\FieldSetView;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 
 /**

diff --git a/src/ResolvedFieldTypeFactory.php → src/Field/ResolvedFieldTypeFactory.php b/src/ResolvedFieldTypeFactory.php → src/Field/ResolvedFieldTypeFactory.php
@@ -11,7 +11,9 @@
  * with this source code in the file LICENSE.
  */
 
-namespace Rollerworks\Component\Search;
+namespace Rollerworks\Component\Search\Field;
+
+use Rollerworks\Component\Search\Exception;
 
 /**
  * @author Sebastiaan Stok <s.stok@rollerscapes.net>