Merge branch 'develop' of https://github.com/ec-europa/toolkit into …

…develop
ec-europa · Feb 19, 2018 · 1f9c8c6 · 1f9c8c6
2 parents c97179f + b935a43
commit 1f9c8c6
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 11 deletions.
diff --git a/build.default.props b/build.default.props
@@ -230,11 +230,12 @@ db.url = ${db.type}://${db.user}:${db.password}@${db.host}:${db.port}/${db.name}
 # Solr configuration.
 # -------------------
 solr.enable = 1
-solr.host = solr
+solr.scheme = http
+solr.host = localhost
 solr.port = 8983
+solr.path = /solr
 solr.type = d7_apachesolr
-solr.scheme = http
-solr.url = ${solr.scheme}://${solr.host}:${solr.port}/solr/${solr.type}
+solr.url = ${solr.scheme}://${solr.host}:${solr.port}${solr.path}/${solr.type}
 
 # Admin configuration.
 # --------------------

diff --git a/docs/configuring-project.md b/docs/configuring-project.md
@@ -249,11 +249,12 @@ db.url = ${db.type}://${db.user}:${db.password}@${db.host}:${db.port}/${db.name}
 # Solr configuration.
 # -------------------
 solr.enable = 1
-solr.host = solr
+solr.scheme = http
+solr.host = localhost
 solr.port = 8983
+solr.path = /solr
 solr.type = d7_apachesolr
-solr.scheme = http
-solr.url = ${solr.scheme}://${solr.host}:${solr.port}/solr/${solr.type}
+solr.url = ${solr.scheme}://${solr.host}:${solr.port}${solr.path}/${solr.type}
 
 # Admin configuration.
 # --------------------

diff --git a/includes/phing/props/forbidden.props b/includes/phing/props/forbidden.props
@@ -32,7 +32,7 @@ db.url = ${db.type}://${db.user}:${db.password}@${db.host}:${db.port}/${db.name}
 
 # Solr configuration.
 # -------------------
-solr.url = ${solr.schem}://${solr.host}:${solr.port}/solr/${solr.type}
+solr.url = ${solr.schem}://${solr.host}:${solr.port}${solr.path}/${solr.type}
 
 # Local resources.
 # ----------------

diff --git a/includes/phing/props/main.props b/includes/phing/props/main.props
@@ -69,11 +69,12 @@ db.prefix =
 # Solr configuration.
 # -------------------
 solr.enable = 1
+solr.scheme = http
 solr.host = 127.0.0.1
 solr.port = 8983
+solr.path = /solr
 solr.type = d7_apachesolr
-solr.scheme = http
-solr.url = ${solr.scheme}://${solr.host}:${solr.port}/solr/${solr.type}
+solr.url = ${solr.scheme}://${solr.host}:${solr.port}${solr.path}/${solr.type}
 
 # Admin configuration.
 # --------------------

diff --git a/includes/phing/src/Tasks/PhpCodeSnifferConfigurationTask.php b/includes/phing/src/Tasks/PhpCodeSnifferConfigurationTask.php
@@ -158,8 +158,8 @@ public function main()
 
         // Add the shorthand options.
         $shorthand_options = array(
-            'p' => 'showProgress',
-            's' => 'showSniffCodes',
+            'p' => '_showProgress',
+            's' => '_showSniffCodes',
         );
 
         $options = array_filter(