Merge branch '25-php-error-in-feature-area' into 'master'

Resolve "PHP error in feature area"

Closes #25

See merge request t3o/typo3_roadmap!18

Classes/Domain/Model/Feature.php

@@ -17,6 +17,7 @@ namespace T3o\Typo3Roadmap\Domain\Model;
 
 use TYPO3\CMS\Extbase\DomainObject\AbstractEntity;
 use TYPO3\CMS\Extbase\Persistence\ObjectStorage;
+use TYPO3\CMS\Extbase\Annotation as Extbase;
 
 /**
  * Feature
@@ -58,7 +59,6 @@ class Feature extends AbstractEntity
      * typo3releaseminorversion
      *
      * @var \T3o\Typo3Roadmap\Domain\Model\MinorVersion
-     * @TYPO3\CMS\Extbase\Annotation\ORM\Lazy
      */
     protected $typo3releaseminorversion = null;
 
@@ -66,7 +66,6 @@ class Feature extends AbstractEntity
      * typo3releasemajorversion
      *
      * @var \T3o\Typo3Roadmap\Domain\Model\MajorVersion
-     * @TYPO3\CMS\Extbase\Annotation\ORM\Lazy
      */
     protected $typo3releasemajorversion = null;
 
@@ -74,7 +73,6 @@ class Feature extends AbstractEntity
      * featureArea
      *
      * @var \T3o\Typo3Roadmap\Domain\Model\FeatureArea
-     * @TYPO3\CMS\Extbase\Annotation\ORM\Lazy
      */
     protected $featureArea = null;
 

Classes/Domain/Model/FeatureArea.php

@@ -18,6 +18,7 @@ namespace T3o\Typo3Roadmap\Domain\Model;
 use TYPO3\CMS\Extbase\Domain\Model\FileReference;
 use TYPO3\CMS\Extbase\DomainObject\AbstractEntity;
 use TYPO3\CMS\Extbase\Persistence\ObjectStorage;
+use TYPO3\CMS\Extbase\Annotation as Extbase;
 
 /**
  * FeatureArea

Classes/Domain/Repository/FeatureRepository.php

@@ -51,14 +51,14 @@ class FeatureRepository extends Repository
         //We need at least min 1 filterConstraint
         $constraints[] = $query->greaterThan('uid', 0);
 
-        if ($setting['majorversion'] !== '') {
+        if ($setting['majorversion'] <> '') {
             $constraints[] = $query->equals('typo3releasemajorversion', (int)$setting['majorversion']);
         }
-        if ($setting['minorversion'] !== '') {
+        if ($setting['minorversion'] <> '') {
             $constraints[] = $query->equals('typo3releaseminorversion', (int)$setting['minorversion']);
         }
 
-        if ($setting['featurearea'] !== '') {
+        if ($setting['featurearea'] <> '') {
             $constraints[] = $query->equals('featureArea', (int)$setting['featurearea']);
         }
 

Configuration/FlexForms/Features.xml

@@ -17,6 +17,7 @@
                             <onChange>reload</onChange>
                             <config>
                                 <type>select</type>
+                                <renderType>selectSingle</renderType>
                                 <items type="array">
                                     <numIndex index="0" type="array">
                                         <numIndex index="0"></numIndex>
@@ -36,6 +37,7 @@
                             <displayCond>FIELD:settings.majorversion:REQ:true</displayCond>
                             <config>
                                 <type>select</type>
+                                <renderType>selectSingle</renderType>
                                 <itemsProcFunc>T3o\Typo3Roadmap\UserFunc\FlexFormUserFunc->getMinorversions</itemsProcFunc>
                             </config>
                         </TCEforms>
@@ -46,6 +48,7 @@
                             <label>Featurearea</label>
                             <config>
                                 <type>select</type>
+                                <renderType>selectSingle</renderType>
                                 <items type="array">
                                     <numIndex index="0" type="array">
                                         <numIndex index="0"></numIndex>
@@ -62,4 +65,4 @@
             </ROOT>
         </sDEF>
     </sheets>
-</T3DataStructure>
+</T3DataStructure>
\ No newline at end of file

ext_emconf.php

@@ -29,7 +29,7 @@ $EM_CONF[$_EXTKEY] = array(
     'clearCacheOnLoad' => 0,
     'lockType' => '',
     'author_company' => 'TYPO3 Association',
-    'version' => '4.0.0',
+    'version' => '4.0.1',
     'constraints' => array(
         'depends' => array(
             'typo3' => '10.3.0-10.4.99',