rename lib to lib-php

diff --git a/cmake/script.tmpl b/cmake/script.tmpl
index aa25a1248418d064916454880eff55f94a71adf5..5fdfe5424605aebb63c0bb931ca14188ffa8ca3e 100755 (executable)
--- a/cmake/script.tmpl
+++ b/cmake/script.tmpl
@@ -1,6 +1,6 @@
 #!@PHP_BIN@ -Cq
 <?php
-require('@CMAKE_SOURCE_DIR@/lib/dotenv_loader.php');
+require('@CMAKE_SOURCE_DIR@/lib-php/dotenv_loader.php');
 
 @define('CONST_Default_ModulePath', '@CMAKE_BINARY_DIR@/module');
 @define('CONST_Default_Osm2pgsql', '@CMAKE_BINARY_DIR@/osm2pgsql/osm2pgsql');
@@ -10,4 +10,4 @@ require('@CMAKE_SOURCE_DIR@/lib/dotenv_loader.php');
 loadDotEnv();
 $_SERVER['NOMINATIM_NOMINATIM_TOOL'] = '@CMAKE_BINARY_DIR@/nominatim';
 
-require_once('@CMAKE_SOURCE_DIR@/lib/admin/@script_source@');
+require_once('@CMAKE_SOURCE_DIR@/lib-php/admin/@script_source@');

diff --git a/cmake/tool.tmpl b/cmake/tool.tmpl
index c73249b1c51bb8036cc1830e2aaaa812f0423b7f..67d57ad7e270a11c5cad5b8e304208bdbbb4fa69 100755 (executable)
--- a/cmake/tool.tmpl
+++ b/cmake/tool.tmpl
@@ -10,6 +10,6 @@ from nominatim import cli
 
 exit(cli.nominatim(module_dir='@CMAKE_BINARY_DIR@/module',
                    osm2pgsql_path='@CMAKE_BINARY_DIR@/osm2pgsql/osm2pgsql',
-                   phplib_dir='@CMAKE_SOURCE_DIR@/lib',
+                   phplib_dir='@CMAKE_SOURCE_DIR@/lib-php',
                    data_dir='@CMAKE_SOURCE_DIR@',
                    phpcgi_path='@PHPCGI_BIN@'))

diff --git a/lib/AddressDetails.php b/lib-php/AddressDetails.php
similarity index 100%
rename from lib/AddressDetails.php
rename to lib-php/AddressDetails.php

diff --git a/lib/ClassTypes.php b/lib-php/ClassTypes.php
similarity index 100%
rename from lib/ClassTypes.php
rename to lib-php/ClassTypes.php

diff --git a/lib/DB.php b/lib-php/DB.php
similarity index 100%
rename from lib/DB.php
rename to lib-php/DB.php

diff --git a/lib/DatabaseError.php b/lib-php/DatabaseError.php
similarity index 100%
rename from lib/DatabaseError.php
rename to lib-php/DatabaseError.php

diff --git a/lib/DebugHtml.php b/lib-php/DebugHtml.php
similarity index 100%
rename from lib/DebugHtml.php
rename to lib-php/DebugHtml.php

diff --git a/lib/DebugNone.php b/lib-php/DebugNone.php
similarity index 100%
rename from lib/DebugNone.php
rename to lib-php/DebugNone.php

diff --git a/lib/Geocode.php b/lib-php/Geocode.php
similarity index 100%
rename from lib/Geocode.php
rename to lib-php/Geocode.php

diff --git a/lib/ParameterParser.php b/lib-php/ParameterParser.php
similarity index 100%
rename from lib/ParameterParser.php
rename to lib-php/ParameterParser.php

diff --git a/lib/Phrase.php b/lib-php/Phrase.php
similarity index 100%
rename from lib/Phrase.php
rename to lib-php/Phrase.php

diff --git a/lib/PlaceLookup.php b/lib-php/PlaceLookup.php
similarity index 100%
rename from lib/PlaceLookup.php
rename to lib-php/PlaceLookup.php

diff --git a/lib/Result.php b/lib-php/Result.php
similarity index 100%
rename from lib/Result.php
rename to lib-php/Result.php

diff --git a/lib/ReverseGeocode.php b/lib-php/ReverseGeocode.php
similarity index 100%
rename from lib/ReverseGeocode.php
rename to lib-php/ReverseGeocode.php

diff --git a/lib/SearchContext.php b/lib-php/SearchContext.php
similarity index 100%
rename from lib/SearchContext.php
rename to lib-php/SearchContext.php

diff --git a/lib/SearchDescription.php b/lib-php/SearchDescription.php
similarity index 100%
rename from lib/SearchDescription.php
rename to lib-php/SearchDescription.php

diff --git a/lib/Shell.php b/lib-php/Shell.php
similarity index 100%
rename from lib/Shell.php
rename to lib-php/Shell.php

diff --git a/lib/SpecialSearchOperator.php b/lib-php/SpecialSearchOperator.php
similarity index 100%
rename from lib/SpecialSearchOperator.php
rename to lib-php/SpecialSearchOperator.php

diff --git a/lib/Status.php b/lib-php/Status.php
similarity index 100%
rename from lib/Status.php
rename to lib-php/Status.php

diff --git a/lib/TokenCountry.php b/lib-php/TokenCountry.php
similarity index 100%
rename from lib/TokenCountry.php
rename to lib-php/TokenCountry.php

diff --git a/lib/TokenHousenumber.php b/lib-php/TokenHousenumber.php
similarity index 100%
rename from lib/TokenHousenumber.php
rename to lib-php/TokenHousenumber.php

diff --git a/lib/TokenList.php b/lib-php/TokenList.php
similarity index 100%
rename from lib/TokenList.php
rename to lib-php/TokenList.php

diff --git a/lib/TokenPostcode.php b/lib-php/TokenPostcode.php
similarity index 100%
rename from lib/TokenPostcode.php
rename to lib-php/TokenPostcode.php

diff --git a/lib/TokenSpecialTerm.php b/lib-php/TokenSpecialTerm.php
similarity index 100%
rename from lib/TokenSpecialTerm.php
rename to lib-php/TokenSpecialTerm.php

diff --git a/lib/TokenWord.php b/lib-php/TokenWord.php
similarity index 100%
rename from lib/TokenWord.php
rename to lib-php/TokenWord.php

diff --git a/lib/admin/check_import_finished.php b/lib-php/admin/check_import_finished.php
similarity index 100%
rename from lib/admin/check_import_finished.php
rename to lib-php/admin/check_import_finished.php

diff --git a/lib/admin/country_languages.php b/lib-php/admin/country_languages.php
similarity index 100%
rename from lib/admin/country_languages.php
rename to lib-php/admin/country_languages.php

diff --git a/lib/admin/export.php b/lib-php/admin/export.php
similarity index 100%
rename from lib/admin/export.php
rename to lib-php/admin/export.php

diff --git a/lib/admin/query.php b/lib-php/admin/query.php
similarity index 100%
rename from lib/admin/query.php
rename to lib-php/admin/query.php

diff --git a/lib/admin/setup.php b/lib-php/admin/setup.php
similarity index 100%
rename from lib/admin/setup.php
rename to lib-php/admin/setup.php

diff --git a/lib/admin/specialphrases.php b/lib-php/admin/specialphrases.php
similarity index 100%
rename from lib/admin/specialphrases.php
rename to lib-php/admin/specialphrases.php

diff --git a/lib/admin/update.php b/lib-php/admin/update.php
similarity index 100%
rename from lib/admin/update.php
rename to lib-php/admin/update.php

diff --git a/lib/admin/warm.php b/lib-php/admin/warm.php
similarity index 100%
rename from lib/admin/warm.php
rename to lib-php/admin/warm.php

diff --git a/lib/cmd.php b/lib-php/cmd.php
similarity index 100%
rename from lib/cmd.php
rename to lib-php/cmd.php

diff --git a/lib/dotenv_loader.php b/lib-php/dotenv_loader.php
similarity index 100%
rename from lib/dotenv_loader.php
rename to lib-php/dotenv_loader.php

diff --git a/lib/init-cmd.php b/lib-php/init-cmd.php
similarity index 100%
rename from lib/init-cmd.php
rename to lib-php/init-cmd.php

diff --git a/lib/init-website.php b/lib-php/init-website.php
similarity index 100%
rename from lib/init-website.php
rename to lib-php/init-website.php

diff --git a/lib/init.php b/lib-php/init.php
similarity index 100%
rename from lib/init.php
rename to lib-php/init.php

diff --git a/lib/lib.php b/lib-php/lib.php
similarity index 100%
rename from lib/lib.php
rename to lib-php/lib.php

diff --git a/lib/log.php b/lib-php/log.php
similarity index 100%
rename from lib/log.php
rename to lib-php/log.php

diff --git a/lib/output.php b/lib-php/output.php
similarity index 100%
rename from lib/output.php
rename to lib-php/output.php

diff --git a/lib/setup/SetupClass.php b/lib-php/setup/SetupClass.php
similarity index 100%
rename from lib/setup/SetupClass.php
rename to lib-php/setup/SetupClass.php

diff --git a/lib/setup_functions.php b/lib-php/setup_functions.php
similarity index 100%
rename from lib/setup_functions.php
rename to lib-php/setup_functions.php

diff --git a/lib/template/address-geocodejson.php b/lib-php/template/address-geocodejson.php
similarity index 100%
rename from lib/template/address-geocodejson.php
rename to lib-php/template/address-geocodejson.php

diff --git a/lib/template/address-geojson.php b/lib-php/template/address-geojson.php
similarity index 100%
rename from lib/template/address-geojson.php
rename to lib-php/template/address-geojson.php

diff --git a/lib/template/address-json.php b/lib-php/template/address-json.php
similarity index 100%
rename from lib/template/address-json.php
rename to lib-php/template/address-json.php

diff --git a/lib/template/address-xml.php b/lib-php/template/address-xml.php
similarity index 100%
rename from lib/template/address-xml.php
rename to lib-php/template/address-xml.php

diff --git a/lib/template/details-json.php b/lib-php/template/details-json.php
similarity index 100%
rename from lib/template/details-json.php
rename to lib-php/template/details-json.php

diff --git a/lib/template/error-json.php b/lib-php/template/error-json.php
similarity index 100%
rename from lib/template/error-json.php
rename to lib-php/template/error-json.php

diff --git a/lib/template/error-xml.php b/lib-php/template/error-xml.php
similarity index 100%
rename from lib/template/error-xml.php
rename to lib-php/template/error-xml.php

diff --git a/lib/template/search-batch-json.php b/lib-php/template/search-batch-json.php
similarity index 100%
rename from lib/template/search-batch-json.php
rename to lib-php/template/search-batch-json.php

diff --git a/lib/template/search-geocodejson.php b/lib-php/template/search-geocodejson.php
similarity index 100%
rename from lib/template/search-geocodejson.php
rename to lib-php/template/search-geocodejson.php

diff --git a/lib/template/search-geojson.php b/lib-php/template/search-geojson.php
similarity index 100%
rename from lib/template/search-geojson.php
rename to lib-php/template/search-geojson.php

diff --git a/lib/template/search-json.php b/lib-php/template/search-json.php
similarity index 100%
rename from lib/template/search-json.php
rename to lib-php/template/search-json.php

diff --git a/lib/template/search-xml.php b/lib-php/template/search-xml.php
similarity index 100%
rename from lib/template/search-xml.php
rename to lib-php/template/search-xml.php

diff --git a/lib/website/deletable.php b/lib-php/website/deletable.php
similarity index 100%
rename from lib/website/deletable.php
rename to lib-php/website/deletable.php

diff --git a/lib/website/details.php b/lib-php/website/details.php
similarity index 100%
rename from lib/website/details.php
rename to lib-php/website/details.php

diff --git a/lib/website/lookup.php b/lib-php/website/lookup.php
similarity index 100%
rename from lib/website/lookup.php
rename to lib-php/website/lookup.php

diff --git a/lib/website/polygons.php b/lib-php/website/polygons.php
similarity index 100%
rename from lib/website/polygons.php
rename to lib-php/website/polygons.php

diff --git a/lib/website/reverse.php b/lib-php/website/reverse.php
similarity index 100%
rename from lib/website/reverse.php
rename to lib-php/website/reverse.php

diff --git a/lib/website/search.php b/lib-php/website/search.php
similarity index 100%
rename from lib/website/search.php
rename to lib-php/website/search.php

diff --git a/lib/website/status.php b/lib-php/website/status.php
similarity index 100%
rename from lib/website/status.php
rename to lib-php/website/status.php

diff --git a/test/bdd/steps/cgi-with-coverage.php b/test/bdd/steps/cgi-with-coverage.php
index 80f898a3f400430dc4d5bdf4792a1ee356d52bae..6f0d79bb2202bde84de2a1b9e9db79c98a5006c2 100644 (file)
--- a/test/bdd/steps/cgi-with-coverage.php
+++ b/test/bdd/steps/cgi-with-coverage.php
@@ -10,7 +10,7 @@ function coverage_shutdown($oCoverage)
 }
 
 $covfilter = new SebastianBergmann\CodeCoverage\Filter();
-$covfilter->addDirectoryToWhitelist($_SERVER['COV_PHP_DIR'].'/lib');
+$covfilter->addDirectoryToWhitelist($_SERVER['COV_PHP_DIR'].'/lib-php');
 $covfilter->addDirectoryToWhitelist($_SERVER['COV_PHP_DIR'].'/website');
 $coverage = new SebastianBergmann\CodeCoverage\CodeCoverage(null, $covfilter);
 $coverage->start($_SERVER['COV_TEST_NAME']);

diff --git a/test/bdd/steps/nominatim_environment.py b/test/bdd/steps/nominatim_environment.py
index 0ee921375e8544594e65ddb2b213ceffe8cb1a59..892d21e9af8b4278838fcfa614f1439ce042f0ea 100644 (file)
--- a/test/bdd/steps/nominatim_environment.py
+++ b/test/bdd/steps/nominatim_environment.py
@@ -262,7 +262,7 @@ class NominatimEnvironment:
         """ Run one of the Nominatim utility scripts with the given arguments.
         """
         cmd = ['/usr/bin/env', 'php', '-Cq']
-        cmd.append((Path(self.src_dir) / 'lib' / 'admin' / '{}.php'.format(script)).resolve())
+        cmd.append((Path(self.src_dir) / 'lib-php' / 'admin' / '{}.php'.format(script)).resolve())
         cmd.extend(['--' + x for x in args])
         for k, v in kwargs.items():
             cmd.extend(('--' + k.replace('_', '-'), str(v)))

diff --git a/test/bdd/steps/steps_api_queries.py b/test/bdd/steps/steps_api_queries.py
index ad4a8515af55d39ea62a9570d76d91084f69fa22..1b3da08b82f25913ad5721d3f7dec11f28d9574a 100644 (file)
--- a/test/bdd/steps/steps_api_queries.py
+++ b/test/bdd/steps/steps_api_queries.py
@@ -60,7 +60,7 @@ def query_cmd(context, query, dups):
     """ Query directly via PHP script.
     """
     cmd = ['/usr/bin/env', 'php']
-    cmd.append(context.nominatim.src_dir  / 'lib' / 'admin' / 'query.php')
+    cmd.append(context.nominatim.src_dir  / 'lib-php' / 'admin' / 'query.php')
     if query:
         cmd.extend(['--search', query])
     # add more parameters in table form

diff --git a/test/php/bootstrap.php b/test/php/bootstrap.php
index 3a36db38e3dea0486b77402789a934cd663abdfa..bfdbbf0595c15bb497b040d2cef0da188124366b 100644 (file)
--- a/test/php/bootstrap.php
+++ b/test/php/bootstrap.php
@@ -1,5 +1,5 @@
 <?php
-    @define('CONST_LibDir', '../../lib');
+    @define('CONST_LibDir', '../../lib-php');
     @define('CONST_DataDir', '../..');
 
     @define('CONST_Debug', true);

diff --git a/test/php/phpunit.xml b/test/php/phpunit.xml
index 8764d49efa72c70f315619de8f15d8cbbd3ff2d4..79341a00acdb99c3aea5536227bf1dd6b45a2b87 100644 (file)
--- a/test/php/phpunit.xml
+++ b/test/php/phpunit.xml
@@ -19,7 +19,7 @@
     </testsuites>
     <filter>
         <whitelist>
-            <directory>../../lib/</directory>
+            <directory>../../lib-php/</directory>
         </whitelist>
     </filter>
 

diff --git a/test/python/test_cli.py b/test/python/test_cli.py
index f62bccf765c754809f82603afff27fae04b7833b..334a9e78985773e174b1be9decb4faf37347d1e4 100644 (file)
--- a/test/python/test_cli.py
+++ b/test/python/test_cli.py
@@ -23,7 +23,7 @@ from nominatim.db import status
 def call_nominatim(*args):
     return nominatim.cli.nominatim(module_dir='build/module',
                                    osm2pgsql_path='build/osm2pgsql/osm2pgsql',
-                                   phplib_dir='lib',
+                                   phplib_dir='lib-php',
                                    data_dir='.',
                                    phpcgi_path='/usr/bin/php-cgi',
                                    cli_args=args)