Updated directory structure

.gitignore

@@ -2,6 +2,7 @@
 CodeCoverage/
 vendor/
 var/
+build/
 composer.phar
 composer.lock
 phpunit.phar

.scrutinizer.yml

@@ -1,6 +1,6 @@
 filter:
     excluded_paths:
-        - 'Tests/*'
+        - 'tests/*'
         - 'vendor/*'
 tools:
     external_code_coverage: true

composer.json

@@ -2,6 +2,13 @@
     "name": "netgen/enhanced-selection-bundle",
     "description": "Netgen Enhanced Selection bundle for eZ Publish",
     "type": "ezplatform-bundle",
+    "keywords": [
+        "ezpublish",
+        "ezplatform",
+        "netgen",
+        "enhanced-selection-bundle"
+    ],
+    "homepage": "https://github.com/netgen/NetgenEnhancedSelectionBundle",
     "license": "GPL-2.0",
     "authors": [
         {
@@ -14,7 +21,8 @@
     },
     "require-dev": {
         "phpunit/phpunit": "^5.7|^6.0",
-        "netgen/ez-forms-bundle": "*"
+        "netgen/ez-forms-bundle": "^2.0",
+        "friendsofphp/php-cs-fixer": "~2.0"
     },
     "suggest": {
         "netgen/enhancedselection2": "To edit this field type in legacy administration interface",
@@ -26,7 +34,19 @@
         "ezsystems/ezplatform-solr-search-engine": "<1.2.0"
     },
     "autoload": {
-        "psr-4": { "Netgen\\Bundle\\EnhancedSelectionBundle\\": "" }
+        "psr-4": {
+            "Netgen\\Bundle\\EnhancedSelectionBundle\\": "bundle/"
+        }
+    },
+    "autoload-dev": {
+        "psr-4": {
+            "Netgen\\Bundle\\EnhancedSelectionBundle\\Tests\\": "tests/"
+        }
+    },
+    "scripts": {
+        "test": "@php vendor/bin/phpunit --colors=always",
+        "coverage": "@php -dzend_extension=xdebug.so vendor/bin/phpunit --colors=always",
+        "fix": "@php vendor/bin/php-cs-fixer fix"
     },
     "extra": {
         "branch-alias": {

phpunit.xml

@@ -1,28 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <phpunit bootstrap="vendor/autoload.php"
          backupGlobals="false"
          backupStaticAttributes="false"
          convertErrorsToExceptions="true"
          convertNoticesToExceptions="true"
          convertWarningsToExceptions="true"
          colors="true"
+         verbose="true"
+         processIsolation="false"
+         stopOnFailure="false"
 >
     <testsuites>
         <testsuite name="Netgen\EnhancedSelectionBundle\Tests">
-            <directory>Tests</directory>
+            <directory>tests</directory>
         </testsuite>
     </testsuites>
     <filter>
         <whitelist>
-            <directory>.</directory>
+            <directory suffix=".php">bundle</directory>
             <exclude>
-                <directory>DependencyInjection</directory>
-                <directory>Resources</directory>
-                <directory>Tests</directory>
+                <directory>bundle/DependencyInjection</directory>
+                <directory>bundle/Resources</directory>
                 <directory>vendor</directory>
-                <file>Core/Search/Legacy/Content/Common/Gateway/CriterionHandler/EnhancedSelection.php</file>
-                <file>Core/FieldType/EnhancedSelection/SearchField.php</file>
-                <file>NetgenEnhancedSelectionBundle.php</file>
+                <file>bundle/Core/Search/Legacy/Content/Common/Gateway/CriterionHandler/EnhancedSelection.php</file>
+                <file>bundle/Core/FieldType/EnhancedSelection/SearchField.php</file>
+                <file>bundle/NetgenEnhancedSelectionBundle.php</file>
             </exclude>
         </whitelist>
     </filter>
+    <logging>
+        <log type="junit" target="build/report.junit.xml"/>
+        <log type="coverage-html" target="build/coverage" charset="UTF-8" yui="true" highlight="true"/>
+        <log type="coverage-text" target="build/coverage.txt"/>
+        <log type="coverage-clover" target="build/logs/clover.xml"/>
+    </logging>
 </phpunit>