Merge 304c104 into 6c5b6e2

cross-solution · Oct 31, 2018 · d995343 · d995343
2 parents 6c5b6e2 + 304c104
commit d995343
Show file tree

Hide file tree

Showing 39 changed files with 98 additions and 52 deletions.
diff --git a/module/Applications/src/Applications/Factory/Form/StatusSelectFactory.php b/module/Applications/src/Applications/Factory/Form/StatusSelectFactory.php
@@ -10,7 +10,7 @@
 /** */
 namespace Applications\Factory\Form;
 
-use \Zend\Form\Element\Select;
+use \Core\Form\Element\Select;
 use Interop\Container\ContainerInterface;
 use Zend\ServiceManager\AbstractPluginManager;
 use Zend\ServiceManager\FactoryInterface;

diff --git a/module/Applications/src/Applications/Form/Element/JobSelect.php b/module/Applications/src/Applications/Form/Element/JobSelect.php
@@ -12,7 +12,7 @@
 
 use Core\Form\HeadscriptProviderInterface;
 use Jobs\Entity\JobInterface;
-use Zend\Form\Element\Select;
+use Core\Form\Element\Select;
 
 /**
  * Select element for job titles

diff --git a/module/Applications/src/Applications/Form/FactsFieldset.php b/module/Applications/src/Applications/Form/FactsFieldset.php
@@ -39,7 +39,7 @@ public function init()
         $this->add(
             array(
             'name' => 'willingnessToTravel',
-            'type' => '\Zend\Form\Element\Select',
+            'type' => '\Core\Form\Element\Select',
             'options' => array(
                 'value_options' => array(
                     '' => '', // needed for jquery select2 to render the placeholder
@@ -96,7 +96,7 @@ public function init()
         $this->add(
             array(
                 'name'       => 'drivingLicense',
-                'type'       => '\Zend\Form\Element\Select',
+                'type'       => '\Core\Form\Element\Select',
                 'options'    => array(
                     'value_options'   => array(
                         ''  => '', // needed for jquery select2 to render the placeholder

diff --git a/module/Applications/test/ApplicationsTest/Factory/Form/StatusSelectFactoryTest.php b/module/Applications/test/ApplicationsTest/Factory/Form/StatusSelectFactoryTest.php
@@ -14,7 +14,7 @@
 use Applications\Repository\Application as ApplicationsRepository;
 use CoreTestUtils\TestCase\ServiceManagerMockTrait;
 use CoreTestUtils\TestCase\TestInheritanceTrait;
-use Zend\Form\Element\Select;
+use Core\Form\Element\Select;
 use Zend\ServiceManager\Factory\FactoryInterface;
 
 /**

diff --git a/module/Applications/test/ApplicationsTest/Form/Element/JobSelectTest.php b/module/Applications/test/ApplicationsTest/Form/Element/JobSelectTest.php
@@ -15,7 +15,7 @@
 use CoreTestUtils\TestCase\TestInheritanceTrait;
 use CoreTestUtils\TestCase\TestSetterGetterTrait;
 use Jobs\Entity\Job;
-use Zend\Form\Element\Select;
+use Core\Form\Element\Select;
 
 /**
  * Tests for \Applications\Form\Element\JobSelect

diff --git a/module/Auth/src/Auth/Factory/Form/RoleSelectFactory.php b/module/Auth/src/Auth/Factory/Form/RoleSelectFactory.php
@@ -11,7 +11,7 @@
 
 use Interop\Container\ContainerInterface;
 use Zend\ServiceManager\Factory\FactoryInterface;
-use Zend\Form\Element\Select;
+use Core\Form\Element\Select;
 use Auth\Entity\User;
 
 /**

diff --git a/module/Auth/src/Auth/Form/UserInfoFieldset.php b/module/Auth/src/Auth/Form/UserInfoFieldset.php
@@ -127,7 +127,7 @@ public function init()
         $this->add(
             array(
                 'name'       => 'gender',
-                'type'       => 'Zend\Form\Element\Select',
+                'type'       => 'Core\Form\Element\Select',
                 'options'    => [
                     'label'         => /*@translate */ 'Salutation',
                     'value_options' => [

diff --git a/module/Auth/src/Auth/Form/UserStatusFieldset.php b/module/Auth/src/Auth/Form/UserStatusFieldset.php
@@ -79,7 +79,7 @@ public function init()
         $this->add(
             [
                 'name'       => 'status',
-                'type'       => 'Zend\Form\Element\Select',
+                'type'       => 'Core\Form\Element\Select',
                 'options'    => [
                     'label'         => /*@translate */ 'Status',
                     'value_options' => $this->statusOptions

diff --git a/module/Auth/test/AuthTest/Form/UserStatusFieldsetTest.php b/module/Auth/test/AuthTest/Form/UserStatusFieldsetTest.php
@@ -40,7 +40,7 @@ public function testInit()
         $this->assertTrue($this->fieldset->has('status'));
 
         $status = $this->fieldset->get('status');
-        $this->assertInstanceOf(\Zend\Form\Element\Select::class, $status);
+        $this->assertInstanceOf(\Core\Form\Element\Select::class, $status);
 		$this->assertSame([], $status->getValueOptions());
     }
 

diff --git a/module/Core/config/module.config.php b/module/Core/config/module.config.php
@@ -466,6 +466,7 @@
             'SummaryFormButtonsFieldset' => 'Core\Form\SummaryFormButtonsFieldset',
             'Checkbox' => 'Core\Form\Element\Checkbox',
             'infoCheckBox' => 'Core\Form\Element\InfoCheckbox',
+            'Core/Select' => 'Core\Form\Element\Select',
             'Core/ListFilterButtons' => '\Core\Form\ListFilterButtonsFieldset',
             'Core/Datepicker' => 'Core\Form\Element\DatePicker',
             'Core/FileUpload' => '\Core\Form\Element\FileUpload',

diff --git a/module/Core/src/Core/Form/Element/Rating.php b/module/Core/src/Core/Form/Element/Rating.php
@@ -11,7 +11,7 @@
 namespace Core\Form\Element;
 
 use Zend\Form\Element;
-use Zend\Form\Element\Select;
+use Core\Form\Element\Select;
 use Core\Entity\RatingInterface;
 
 /**

diff --git a/module/Core/src/Core/Form/Element/Select.php b/module/Core/src/Core/Form/Element/Select.php
@@ -0,0 +1,44 @@
+<?php
+/**
+ * YAWIK
+ *
+ * @filesource
+ * @copyright (c) 2013 - 2016 Cross Solution (http://cross-solution.de)
+ * @license   MIT
+ */
+
+/**  */
+namespace Core\Form\Element;
+
+use Zend\Form\Element\Select as ZfSelect;
+
+/**
+ *
+ *
+ * @author Mathias Gelhausen <gelhausen@cross-solution.de>
+ */
+class Select extends ZfSelect implements ViewHelperProviderInterface
+{
+    /**
+     * @var string
+     */
+    protected $helper = 'formSelect';
+
+    /**
+     * @param string|\Zend\View\Helper\HelperInterface $helper
+     * @return $this|ViewHelperProviderInterface
+     */
+    public function setViewHelper($helper)
+    {
+        $this->helper = $helper;
+        return $this;
+    }
+
+    /**
+     * @return string|\Zend\View\Helper\HelperInterface
+     */
+    public function getViewHelper()
+    {
+        return $this->helper;
+    }
+}
diff --git a/module/Core/src/Core/Form/LocalizationSettingsFieldset.php b/module/Core/src/Core/Form/LocalizationSettingsFieldset.php
@@ -27,7 +27,7 @@ public function init()
 
         $this->add(
             array(
-                'type' => 'Zend\Form\Element\Select',
+                'type' => 'Core\Form\Element\Select',
                 'name' => 'language',
                 'options' => array(
                         'label' => /* @translate */ 'choose your language',
@@ -59,7 +59,7 @@ public function init()
 
         $this->add(
             array(
-                'type' => 'Zend\Form\Element\Select',
+                'type' => 'Core\Form\Element\Select',
                 'name' => 'timezone',
                 'options' => array(
                         'label' => /* @translate */ 'choose your timzone',

diff --git a/module/Core/src/Core/Form/Tree/Select.php b/module/Core/src/Core/Form/Tree/Select.php
@@ -13,7 +13,7 @@
 use Core\Form\Hydrator\HydratorStrategyProviderInterface;
 use Core\Form\Hydrator\HydratorStrategyProviderTrait;
 use Traversable;
-use Zend\Form\Element\Select as ZfSelect;
+use Core\Form\Element\Select as ZfSelect;
 use Zend\Form\Element;
 use Zend\Form\ElementInterface;
 use Zend\Form\Exception;

diff --git a/module/Core/src/Core/Form/View/Helper/FormSimpleRow.php b/module/Core/src/Core/Form/View/Helper/FormSimpleRow.php
@@ -16,7 +16,7 @@
 use Core\Form\ViewPartialProviderInterface;
 use Core\Form\Element\ViewhelperProviderInterface;
 use Zend\Form\Element\Button;
-use Zend\Form\Element\Select;
+use Core\Form\Element\Select;
 
 class FormSimpleRow extends ZendFormRow
 {

diff --git a/module/Core/src/Core/Form/View/Helper/SummaryForm.php b/module/Core/src/Core/Form/View/Helper/SummaryForm.php
@@ -266,7 +266,7 @@ public function renderSummaryElement(ElementInterface $element)
                       ? nl2br($element->getValue())
                       : $element->getValue();
 
-        if ('' != $elementValue && $element instanceof \Zend\Form\Element\Select) {
+        if ('' != $elementValue && $element instanceof \Core\Form\Element\Select) {
             if ($summaryValue = $element->getOption('summary_value')) {
                 $elementValue = is_callable($summaryValue) ? $summaryValue() : $summaryValue;
             } else {

diff --git a/module/Core/src/autoload_classmap.php b/module/Core/src/autoload_classmap.php
@@ -148,6 +148,7 @@
     'Core\Form\DisableCapableInterface'                                               => __DIR__ . '/Core/Form/DisableCapableInterface.php',
     'Core\Form\DisableElementsCapableInterface'                                       => __DIR__ . '/Core/Form/DisableElementsCapableInterface.php',
     'Core\Form\Element\Checkbox'                                                      => __DIR__ . '/Core/Form/Element/Checkbox.php',
+    'Core\Form\Element\Select'                                                        => __DIR__ . '/Core/Form/Element/Select.php',
     'Core\Form\Element\DatePicker'                                                    => __DIR__ . '/Core/Form/Element/DatePicker.php',
     'Core\Form\Element\DateRange'                                                     => __DIR__ . '/Core/Form/Element/DateRange.php',
     'Core\Form\Element\Editor'                                                        => __DIR__ . '/Core/Form/Element/Editor.php',

diff --git a/module/Core/test/CoreTest/Form/Tree/SelectTest.php b/module/Core/test/CoreTest/Form/Tree/SelectTest.php
@@ -13,7 +13,7 @@
 use Core\Form\Hydrator\HydratorStrategyProviderInterface;
 use Core\Form\Hydrator\HydratorStrategyProviderTrait;
 use Core\Form\Tree\Select;
-use Zend\Form\Element\Select as ZfSelect;
+use Core\Form\Element\Select as ZfSelect;
 use CoreTestUtils\TestCase\TestInheritanceTrait;
 use CoreTestUtils\TestCase\TestUsesTraitsTrait;
 

diff --git a/module/Cv/src/Cv/Form/LanguageSkillFieldset.php b/module/Cv/src/Cv/Form/LanguageSkillFieldset.php
@@ -18,7 +18,7 @@ public function init()
         $this->add(
             array(
                 'name'       => 'language',
-                'type'       => 'Zend\Form\Element\Select',
+                'type'       => 'Core\Form\Element\Select',
                 'options'    => array(
                     'label'         => 'Language',
                     'value_options' => NativeLanguageFieldset::$languagesOptions
@@ -34,7 +34,7 @@ public function init()
         $this->add(
             array(
                 'name'       => 'levelListening',
-                'type'       => 'Zend\Form\Element\Select',
+                'type'       => 'Core\Form\Element\Select',
                 'options'    => array(
                     'label'         => /*@translate */ 'Listening',
                     'value_options' => array(
@@ -61,7 +61,7 @@ public function init()
         $this->add(
             array(
                 'name'       => 'levelReading',
-                'type'       => 'Zend\Form\Element\Select',
+                'type'       => 'Core\Form\Element\Select',
                 'options'    => [
                     'label'         => /*@translate */ 'Reading',
                     'value_options' => [
@@ -88,7 +88,7 @@ public function init()
         $this->add(
             array(
                 'name'       => 'levelSpokenInteraction',
-                'type'       => 'Zend\Form\Element\Select',
+                'type'       => 'Core\Form\Element\Select',
                 'options'    => [
                     'label'         => /*@translate */ 'Spoken Interaction',
                     'value_options' => [
@@ -114,7 +114,7 @@ public function init()
         $this->add(
             array(
                 'name'       => 'levelSpokenProduction',
-                'type'       => 'Zend\Form\Element\Select',
+                'type'       => 'Core\Form\Element\Select',
                 'options'    => array(
                     'label'         => /*@translate */ 'Spoken Production',
                     'value_options' => array(
@@ -140,7 +140,7 @@ public function init()
         $this->add(
             array(
                 'name'       => 'levelWriting',
-                'type'       => 'Zend\Form\Element\Select',
+                'type'       => 'Core\Form\Element\Select',
                 'options'    => [
                     'label'         => /*@translate */ 'Writing',
                     'value_options' => [

diff --git a/module/Cv/src/Cv/Form/NativeLanguageFieldset.php b/module/Cv/src/Cv/Form/NativeLanguageFieldset.php
@@ -139,7 +139,7 @@ public function init()
         $this->add(
             [
                 'name'       => 'nativeLanguages',
-                'type'       => 'Zend\Form\Element\Select',
+                'type'       => 'Core\Form\Element\Select',
                 'options'    => array(
                     'label'         => 'Language',
                     'value_options' => self::$languagesOptions

diff --git a/module/Cv/src/Cv/Form/SearchForm.php b/module/Cv/src/Cv/Form/SearchForm.php
@@ -51,7 +51,7 @@ protected function addElements()
         $this->add(
              [
                  'name' => 'd',
-                 'type' => 'Zend\Form\Element\Select',
+                 'type' => 'Core\Form\Element\Select', //Zend\Form\Element\Select
                  'options' => [
                      'label' => /*@translate*/ 'Distance',
                      'value_options' => [

diff --git a/module/Cv/test/CvTest/Form/LanguageSkillFieldsetTest.php b/module/Cv/test/CvTest/Form/LanguageSkillFieldsetTest.php
@@ -55,22 +55,22 @@ public function testInitializesItself()
         $add = [
             [
                 'name' => 'language',
-                'type' => 'Zend\Form\Element\Select',
+                'type' => 'Core\Form\Element\Select',
                 'attributes' => [
                     'data-autoinit' => 'false',
                 ],
             ],
             [
                 'name' => 'levelListening',
-                'type' => 'Zend\Form\Element\Select',
+                'type' => 'Core\Form\Element\Select',
                 'attributes' => [
                     'data-allowclear'  => 'true',
                     'data-searchbox'   => -1,
                 ]
             ],
             [
                 'name' => 'levelReading',
-                'type' => 'Zend\Form\Element\Select',
+                'type' => 'Core\Form\Element\Select',
                 'attributes' => [
                     'data-allowclear'  => 'true',
                     'data-searchbox'   => -1,
@@ -79,23 +79,23 @@ public function testInitializesItself()
             ],
             [
                 'name'       => 'levelSpokenInteraction',
-                'type'       => 'Zend\Form\Element\Select',
+                'type'       => 'Core\Form\Element\Select',
                 'attributes' => [
                     'data-allowclear' => 'true',
                     'data-searchbox'  => -1,
                 ]
             ],
             [
                 'name'       => 'levelSpokenProduction',
-                'type'       => 'Zend\Form\Element\Select',
+                'type'       => 'Core\Form\Element\Select',
                 'attributes' => [
                     'data-allowclear' => 'true',
                     'data-searchbox'  => -1,
                 ]
             ],
             [
                 'name'       => 'levelWriting',
-                'type'       => 'Zend\Form\Element\Select',
+                'type'       => 'Core\Form\Element\Select',
                 'attributes' => [
                     'data-allowclear' => 'true',
                     'data-searchbox'  => -1,

diff --git a/module/Cv/test/CvTest/Form/NativeLanguageFieldsetTest.php b/module/Cv/test/CvTest/Form/NativeLanguageFieldsetTest.php
@@ -177,7 +177,7 @@ public function testInitializesItself()
     {
         $add = [
                     'name'       => 'nativeLanguages',
-                    'type'       => 'Zend\Form\Element\Select',
+                    'type'       => 'Core\Form\Element\Select',
                     'options'    => [
                         'label'         => 'Language',
                         'value_options' => self::$languagesOptions

diff --git a/module/Cv/test/CvTest/Form/SearchFormTest.php b/module/Cv/test/CvTest/Form/SearchFormTest.php
@@ -79,7 +79,7 @@ public function testInitializesItself()
 
         $add2 = [
                  'name' => 'd',
-                 'type' => 'Zend\Form\Element\Select',
+                 'type' => 'Core\Form\Element\Select',
                  'options' => [
                      'label' => /*@translate*/ 'Distance',
                      'value_options' => [

diff --git a/module/Geo/src/Geo/Form/GeoSelect.php b/module/Geo/src/Geo/Form/GeoSelect.php
@@ -14,7 +14,7 @@
 use Core\Form\Hydrator\HydratorStrategyProviderInterface;
 use Core\Form\Hydrator\HydratorStrategyProviderTrait;
 use Doctrine\Common\Collections\Collection;
-use Zend\Form\Element\Select;
+use Core\Form\Element\Select;
 use Zend\Form\Element;
 use Zend\Form\ElementInterface;
 use Zend\Form\Exception\InvalidArgumentException;

diff --git a/module/Geo/src/Geo/Form/GeoSelectSimple.php b/module/Geo/src/Geo/Form/GeoSelectSimple.php
@@ -15,7 +15,7 @@
 use Core\Form\Hydrator\HydratorStrategyProviderInterface;
 use Core\Form\Hydrator\HydratorStrategyProviderTrait;
 use Jobs\Entity\Location;
-use Zend\Form\Element\Select;
+use Core\Form\Element\Select;
 use Zend\Hydrator\Strategy\ClosureStrategy;
 
 /**

diff --git a/module/Geo/test/GeoTest/Form/GeoSelectTest.php b/module/Geo/test/GeoTest/Form/GeoSelectTest.php
@@ -20,7 +20,7 @@
 use Geo\Form\GeoSelect;
 use Geo\Form\GeoSelectHydratorStrategy;
 use Geo\Service\AbstractClient;
-use Zend\Form\Element\Select;
+use Core\Form\Element\Select;
 use Zend\Json\Json;
 
 /**

diff --git a/module/Jobs/src/Jobs/Form/Element/ManagerSelect.php b/module/Jobs/src/Jobs/Form/Element/ManagerSelect.php
@@ -10,7 +10,7 @@
 /** */
 namespace Jobs\Form\Element;
 
-use Zend\Form\Element\Select;
+use Core\Form\Element\Select;
 use Zend\Form\Element;
 use Zend\Stdlib\ArrayUtils;