Renaming in the code too

Author: bolner

Dockerfile

@@ -77,9 +77,9 @@ RUN apt-get -y install apache2 php7.2 php7.2-cli php7.2-mbstring php7.2-curl\
     && mv composer.phar /usr/bin/composer\
 \
     && printf "\
-Alias /MonetDB-PHP-Deux /var/MonetDB-PHP-Deux/Examples/WebQuery/www/\n\
+Alias /MonetDB-PHP /var/MonetDB-PHP/Examples/WebQuery/www/\n\
 \n\
-<Directory /var/MonetDB-PHP-Deux/Examples/WebQuery/www>\n\
+<Directory /var/MonetDB-PHP/Examples/WebQuery/www>\n\
         Options -Indexes +FollowSymLinks -MultiViews\n\
         AllowOverride all\n\
         Order allow,deny\n\
@@ -108,8 +108,8 @@ while true; do sleep infinity; done\n\
 # Finalizing setup
 #######################################################################
 EXPOSE 80
-VOLUME ["/var/MonetDB-PHP-Deux"]
-WORKDIR /var/MonetDB-PHP-Deux
+VOLUME ["/var/MonetDB-PHP"]
+WORKDIR /var/MonetDB-PHP
 ENV DEBIAN_FRONTEND dialog
 
 CMD ["/var/startup.sh"]

Examples/DataModification/README.md

@@ -1,12 +1,12 @@
 Data modification example
 =========================
 
-This is an example project for MonetDB-PHP-Deux.
+This is an example project for MonetDB-PHP.
 
 Steps:
 
 - Follow the Dockerfile instructions in the main README.md file of the project.
 - Log into the Docker container
-- Enter the `/var/MonetDB-PHP-Deux/Examples/DataModification` directory
+- Enter the `/var/MonetDB-PHP/Examples/DataModification` directory
 - Execute `composer install`
 - Start the example program by `php program.php`.

Examples/DataModification/composer.json

@@ -1,5 +1,5 @@
 {
-    "name": "tbolner/monetdb-php-deux-example-modify",
+    "name": "tbolner/monetdb-php-example-modify",
     "description": "An example application for data modification.",
     "keywords": [
         "MonetDB",
@@ -20,7 +20,7 @@
     "require": {
         "php": ">=7.2",
         "ext-mbstring": "*",
-        "tbolner/monetdb-php-deux": "^1.0"
+        "tbolner/monetdb-php": "^1.0"
     },
     "autoload": {
         "psr-4": {

Examples/DataModification/composer.lock

@@ -25,7 +25,7 @@
 ini_set('display_errors', '1');
 error_reporting(E_ALL);
 
-// define("MonetDB-PHP-Deux-DEBUG", 1);
+// define("MonetDB-PHP-DEBUG", 1);
 
 require((__DIR__)."/vendor/autoload.php");
 

Examples/DataModification/program.php

@@ -7,6 +7,6 @@ Steps:
 
 - Follow the Dockerfile instructions in the main README.md file of the project.
 - Log into the Docker container
-- Enter the `/var/MonetDB-PHP-Deux/Examples/JapaneseTest` directory
+- Enter the `/var/MonetDB-PHP/Examples/JapaneseTest` directory
 - Execute `composer install`
 - Start the example program by `php program.php`.

Examples/JapaneseTest/README.md

@@ -1,5 +1,5 @@
 {
-    "name": "tbolner/monetdb-php-deux-example-japanese",
+    "name": "tbolner/monetdb-php-example-japanese",
     "description": "Testing UTF-8 compatibility with Japanese characters.",
     "keywords": [
         "MonetDB",
@@ -20,7 +20,7 @@
     "require": {
         "php": ">=7.2",
         "ext-mbstring": "*",
-        "tbolner/monetdb-php-deux": "^1.0"
+        "tbolner/monetdb-php": "^1.0"
     },
     "autoload": {
         "psr-4": {

Examples/JapaneseTest/composer.json

@@ -27,7 +27,7 @@
 
 require((__DIR__)."/vendor/autoload.php");
 
-// define("MonetDB-PHP-Deux-DEBUG", 1);
+// define("MonetDB-PHP-DEBUG", 1);
 
 try {
     $app = new Application();

Examples/JapaneseTest/composer.lock

@@ -1,19 +1,19 @@
 Web query example
 =================
 
-This is an example project for MonetDB-PHP-Deux.
+This is an example project for MonetDB-PHP.
 
 Steps:
 
 - Follow the Dockerfile instructions in the main README.md file of the project.
 - Log into the Docker container
 - See appendix 1 on how to prepare the database.
-- Enter the `/var/MonetDB-PHP-Deux/Examples/DataModification` directory
+- Enter the `/var/MonetDB-PHP/Examples/DataModification` directory
 - Execute `composer install`
 - Try the following URLs to test the application:
-  - http://127.0.0.1:9292/MonetDB-PHP-Deux/
-  - http://127.0.0.1:9292/MonetDB-PHP-Deux/?name=Fluffor
-  - http://127.0.0.1:9292/MonetDB-PHP-Deux/?min_weight=3&max_weight=11
+  - http://127.0.0.1:9292/MonetDB-PHP/
+  - http://127.0.0.1:9292/MonetDB-PHP/?name=Fluffor
+  - http://127.0.0.1:9292/MonetDB-PHP/?min_weight=3&max_weight=11
 
 ## Appendix 1: preparing the database