rename lib to lib-php

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@');

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@'))

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']);

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)))

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

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);

test/php/phpunit.xml

@@ -19,7 +19,7 @@
     </testsuites>
     <filter>
         <whitelist>
-            <directory>../../lib/</directory>
+            <directory>../../lib-php/</directory>
         </whitelist>
     </filter>
 

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)