Merge pull request josedacosta#1 from josedacosta/wamania

cleaning

composer.json

@@ -1,83 +1,82 @@
 {
-  "name": "josedacosta/jquery-query-builder-bundle",
-  "homepage": "http://github.com/josedacosta/jQueryQueryBuilderBundle",
-  "description": "from jQuery QueryBuilder to Doctrine QueryBuilder",
-  "version": "1.0",
-  "type": "library",
-  "license": "MIT",
-  "authors": [
-    {
-      "name": "José DA COSTA",
-      "email": "[email protected]",
-      "homepage": "http://josedacosta.info"
-    }
-  ],
-  "autoload": {
-    "psr-4": {
-      "JD\\jQueryQueryBuilderBundle\\": ""
-    }
-  },
-  "minimum-stability": "dev",
-  "require": {
-    "php": ">=7",
-    "doctrine/orm": "^2.5"
-  },
-  "require-dev": {
-    "phpunit/phpunit": "4.7.*@dev"
-  },
-  "keywords": [
-    "and",
-    "begins with",
-    "between",
-    "bootstrap",
-    "bootstrap filter",
-    "bootstrap filters",
-    "contains",
-    "dacosta",
-    "doctrine",
-    "doctrine orm",
-    "ends with",
-    "equal",
-    "filter",
-    "filters",
-    "form",
-    "greater",
-    "greater or equal",
-    "in",
-    "input",
-    "is empty",
-    "is not empty",
-    "is not null",
-    "is null",
-    "jose",
-    "josedacosta",
-    "josn",
-    "josn parser",
-    "josé da costa",
-    "jquery",
-    "jquery query builder",
-    "jquery querybuilder",
-    "less",
-    "less or equal",
-    "nosql",
-    "not begins with",
-    "not contains",
-    "not ends with",
-    "not equal",
-    "not in",
-    "or",
-    "orm",
-    "php",
-    "plugin",
-    "plugins",
-    "queries ",
-    "query ",
-    "query builder",
-    "querybuilder",
-    "rule",
-    "rules",
-    "select",
-    "sql",
-    "symfony"
-  ]
+	"name" : "josedacosta/jquery-query-builder-bundle",
+	"homepage" : "http://github.com/josedacosta/jQueryQueryBuilderBundle",
+	"description" : "from jQuery QueryBuilder to Doctrine QueryBuilder",
+	"version" : "1.0",
+	"type" : "library",
+	"license" : "MIT",
+	"authors" : [{
+			"name" : "José DA COSTA",
+			"email" : "[email protected]",
+			"homepage" : "http://josedacosta.info"
+		}
+	],
+	"autoload" : {
+		"psr-4" : {
+			"JD\\jQueryQueryBuilderBundle\\" : "src/"
+		}
+	},
+	"minimum-stability" : "dev",
+	"require" : {
+		"php" : ">=7",
+		"doctrine/orm" : "^2.5"
+	},
+	"require-dev" : {
+		"phpunit/phpunit": "^4.8"
+	},
+	"keywords" : [
+		"and",
+		"begins with",
+		"between",
+		"bootstrap",
+		"bootstrap filter",
+		"bootstrap filters",
+		"contains",
+		"dacosta",
+		"doctrine",
+		"doctrine orm",
+		"ends with",
+		"equal",
+		"filter",
+		"filters",
+		"form",
+		"greater",
+		"greater or equal",
+		"in",
+		"input",
+		"is empty",
+		"is not empty",
+		"is not null",
+		"is null",
+		"jose",
+		"josedacosta",
+		"josn",
+		"josn parser",
+		"josé da costa",
+		"jquery",
+		"jquery query builder",
+		"jquery querybuilder",
+		"less",
+		"less or equal",
+		"nosql",
+		"not begins with",
+		"not contains",
+		"not ends with",
+		"not equal",
+		"not in",
+		"or",
+		"orm",
+		"php",
+		"plugin",
+		"plugins",
+		"queries ",
+		"query ",
+		"query builder",
+		"querybuilder",
+		"rule",
+		"rules",
+		"select",
+		"sql",
+		"symfony"
+	]
 }

phpunit.xml.dist

@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:noNamespaceSchemaLocation="vendor/phpunit/phpunit/phpunit.xsd"
+         backupGlobals="false"
+         colors="true"
+         beStrictAboutChangesToGlobalState="true"
+         beStrictAboutOutputDuringTests="true"
+         beStrictAboutTestsThatDoNotTestAnything="true"
+         beStrictAboutTodoAnnotatedTests="true"
+         verbose="true"
+         bootstrap="vendor/autoload.php">
+
+    <testsuites>
+        <testsuite name="functional">
+            <directory>test</directory>
+        </testsuite>
+    </testsuites>
+
+    <filter>
+        <whitelist>
+            <directory>Services</directory>
+        </whitelist>
+    </filter>
+</phpunit>

Services/jQueryQueryBuilderParser.php → src/Services/jQueryQueryBuilderParser.php

@@ -259,8 +259,13 @@ protected function createNestedQuery(QueryBuilder $queryBuilder, stdClass $rule,
 
         $condition = $this->validateCondition($condition);
 
+        foreach ($rule->rules as $loopRule) {
+
+        }
+
+
         // TODO à finir en Doctrine :
-        exit('TODO : Doctrine Querybuilder where nested !!!');
+        /*exit('TODO : Doctrine Querybuilder where nested !!!');
         return $queryBuilder->whereNested(function ($query) use (&$rule, &$queryBuilder, &$condition) {
             foreach ($rule->rules as $loopRule) {
                 $function = 'makeQuery';
@@ -272,7 +277,12 @@ protected function createNestedQuery(QueryBuilder $queryBuilder, stdClass $rule,
                 $queryBuilder = $this->{$function}($query, $loopRule, $rule->condition);
             }
 
-        }, $condition);
+        }, $condition);*/
+    }
+
+    protected function makeNestedQuery(QueryBuilder $queryBuilder, array $rules, $condition)
+    {
+
     }
 
 }