From 5f15e1ea8c49b741ead563104557b8e1650c2720 Mon Sep 17 00:00:00 2001
From: Jephte Clain <Jephte.Clain@univ-reunion.fr>
Date: Fri, 20 Oct 2023 10:25:20 +0400
Subject: [PATCH] correction php

---
 .idea/.gitignore                   |  8 -----
 .idea/codeception.xml              | 15 --------
 .idea/nulib.iml                    |  8 ++---
 .idea/php-docker-settings.xml      | 15 --------
 .idea/php.xml                      | 48 ++++++++++++-------------
 .idea/phpspec.xml                  | 13 -------
 .idea/phpunit.xml                  | 10 ------
 .idea/vcs.xml                      |  1 -
 composer.lock                      |  8 ++---
 php/src_base/cl.php                |  8 ++---
 php/src_base/{cstr.php => str.php} |  4 +--
 php/tests/cstrTest.php             | 56 ------------------------------
 php/tests/strTest.php              | 56 ++++++++++++++++++++++++++++++
 13 files changed, 93 insertions(+), 157 deletions(-)
 delete mode 100644 .idea/.gitignore
 delete mode 100644 .idea/codeception.xml
 delete mode 100644 .idea/phpspec.xml
 delete mode 100644 .idea/phpunit.xml
 rename php/src_base/{cstr.php => str.php} (99%)
 delete mode 100644 php/tests/cstrTest.php
 create mode 100644 php/tests/strTest.php

diff --git a/.idea/.gitignore b/.idea/.gitignore
deleted file mode 100644
index 13566b8..0000000
--- a/.idea/.gitignore
+++ /dev/null
@@ -1,8 +0,0 @@
-# Default ignored files
-/shelf/
-/workspace.xml
-# Editor-based HTTP Client requests
-/httpRequests/
-# Datasource local storage ignored files
-/dataSources/
-/dataSources.local.xml
diff --git a/.idea/codeception.xml b/.idea/codeception.xml
deleted file mode 100644
index 9da3754..0000000
--- a/.idea/codeception.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="Codeception">
-    <option name="configurations">
-      <list>
-        <Configuration>
-          <option name="path" value="$PROJECT_DIR$/tests" />
-        </Configuration>
-        <Configuration>
-          <option name="path" value="$PROJECT_DIR$/tests" />
-        </Configuration>
-      </list>
-    </option>
-  </component>
-</project>
\ No newline at end of file
diff --git a/.idea/nulib.iml b/.idea/nulib.iml
index ece91f0..cfcc99b 100644
--- a/.idea/nulib.iml
+++ b/.idea/nulib.iml
@@ -2,13 +2,11 @@
 <module type="WEB_MODULE" version="4">
   <component name="NewModuleRootManager">
     <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/php/src_base" isTestSource="false" packagePrefix="nucore\" />
-      <sourceFolder url="file://$MODULE_DIR$/php/tests" isTestSource="true" packagePrefix="nucore\" />
-      <sourceFolder url="file://$MODULE_DIR$/spec" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/tests" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/php/src_base" isTestSource="false" packagePrefix="nulib\" />
+      <sourceFolder url="file://$MODULE_DIR$/php/tests" isTestSource="true" packagePrefix="nulib\" />
       <excludeFolder url="file://$MODULE_DIR$/vendor" />
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
   </component>
-</module>
+</module>
\ No newline at end of file
diff --git a/.idea/php-docker-settings.xml b/.idea/php-docker-settings.xml
index d039669..5c353a5 100644
--- a/.idea/php-docker-settings.xml
+++ b/.idea/php-docker-settings.xml
@@ -3,21 +3,6 @@
   <component name="PhpDockerContainerSettings">
     <list>
       <map>
-        <entry key="125ffb9d-fd5f-4e71-8182-94191665795a">
-          <value>
-            <DockerContainerSettings>
-              <option name="version" value="1" />
-              <option name="volumeBindings">
-                <list>
-                  <DockerVolumeBindingImpl>
-                    <option name="containerPath" value="/opt/project" />
-                    <option name="hostPath" value="$PROJECT_DIR$" />
-                  </DockerVolumeBindingImpl>
-                </list>
-              </option>
-            </DockerContainerSettings>
-          </value>
-        </entry>
         <entry key="c4cf2564-ed91-488c-a93d-fe2daeae80db">
           <value>
             <DockerContainerSettings>
diff --git a/.idea/php.xml b/.idea/php.xml
index 988f6b9..31366f8 100644
--- a/.idea/php.xml
+++ b/.idea/php.xml
@@ -12,36 +12,36 @@
   </component>
   <component name="PhpIncludePathManager">
     <include_path>
-      <path value="$PROJECT_DIR$/vendor/sebastian/diff" />
-      <path value="$PROJECT_DIR$/vendor/sebastian/cli-parser" />
-      <path value="$PROJECT_DIR$/vendor/sebastian/type" />
-      <path value="$PROJECT_DIR$/vendor/sebastian/lines-of-code" />
-      <path value="$PROJECT_DIR$/vendor/sebastian/comparator" />
-      <path value="$PROJECT_DIR$/vendor/sebastian/version" />
-      <path value="$PROJECT_DIR$/vendor/sebastian/environment" />
-      <path value="$PROJECT_DIR$/vendor/sebastian/exporter" />
-      <path value="$PROJECT_DIR$/vendor/sebastian/global-state" />
-      <path value="$PROJECT_DIR$/vendor/sebastian/recursion-context" />
-      <path value="$PROJECT_DIR$/vendor/sebastian/complexity" />
-      <path value="$PROJECT_DIR$/vendor/sebastian/object-enumerator" />
-      <path value="$PROJECT_DIR$/vendor/sebastian/object-reflector" />
-      <path value="$PROJECT_DIR$/vendor/phpunit/phpunit" />
-      <path value="$PROJECT_DIR$/vendor/composer" />
-      <path value="$PROJECT_DIR$/vendor/phpunit/php-timer" />
-      <path value="$PROJECT_DIR$/vendor/myclabs/deep-copy" />
-      <path value="$PROJECT_DIR$/vendor/phpunit/php-text-template" />
-      <path value="$PROJECT_DIR$/vendor/phpunit/php-file-iterator" />
-      <path value="$PROJECT_DIR$/vendor/phpunit/php-code-coverage" />
-      <path value="$PROJECT_DIR$/vendor/phpunit/php-invoker" />
       <path value="$PROJECT_DIR$/vendor/phar-io/manifest" />
       <path value="$PROJECT_DIR$/vendor/nikic/php-parser" />
       <path value="$PROJECT_DIR$/vendor/phar-io/version" />
-      <path value="$PROJECT_DIR$/vendor/doctrine/instantiator" />
       <path value="$PROJECT_DIR$/vendor/sebastian/resource-operations" />
+      <path value="$PROJECT_DIR$/vendor/doctrine/instantiator" />
+      <path value="$PROJECT_DIR$/vendor/phpunit/php-timer" />
+      <path value="$PROJECT_DIR$/vendor/composer" />
+      <path value="$PROJECT_DIR$/vendor/myclabs/deep-copy" />
+      <path value="$PROJECT_DIR$/vendor/phpunit/php-file-iterator" />
+      <path value="$PROJECT_DIR$/vendor/phpunit/php-text-template" />
+      <path value="$PROJECT_DIR$/vendor/phpunit/php-invoker" />
+      <path value="$PROJECT_DIR$/vendor/phpunit/php-code-coverage" />
+      <path value="$PROJECT_DIR$/vendor/sebastian/object-reflector" />
+      <path value="$PROJECT_DIR$/vendor/phpunit/phpunit" />
+      <path value="$PROJECT_DIR$/vendor/sebastian/exporter" />
+      <path value="$PROJECT_DIR$/vendor/sebastian/environment" />
+      <path value="$PROJECT_DIR$/vendor/sebastian/recursion-context" />
+      <path value="$PROJECT_DIR$/vendor/sebastian/global-state" />
+      <path value="$PROJECT_DIR$/vendor/sebastian/object-enumerator" />
+      <path value="$PROJECT_DIR$/vendor/sebastian/complexity" />
+      <path value="$PROJECT_DIR$/vendor/sebastian/cli-parser" />
+      <path value="$PROJECT_DIR$/vendor/nulib/tests" />
+      <path value="$PROJECT_DIR$/vendor/sebastian/diff" />
+      <path value="$PROJECT_DIR$/vendor/sebastian/lines-of-code" />
+      <path value="$PROJECT_DIR$/vendor/sebastian/type" />
+      <path value="$PROJECT_DIR$/vendor/sebastian/version" />
+      <path value="$PROJECT_DIR$/vendor/sebastian/comparator" />
       <path value="$PROJECT_DIR$/vendor/sebastian/code-unit" />
-      <path value="$PROJECT_DIR$/vendor/theseer/tokenizer" />
       <path value="$PROJECT_DIR$/vendor/sebastian/code-unit-reverse-lookup" />
-      <path value="$PROJECT_DIR$/vendor/mur/tests" />
+      <path value="$PROJECT_DIR$/vendor/theseer/tokenizer" />
     </include_path>
   </component>
   <component name="PhpProjectSharedConfiguration" php_language_level="7.3" />
diff --git a/.idea/phpspec.xml b/.idea/phpspec.xml
deleted file mode 100644
index ec7e1d4..0000000
--- a/.idea/phpspec.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="PHPSpec">
-    <suites>
-      <PhpSpecSuiteConfiguration>
-        <option name="myPath" value="$PROJECT_DIR$" />
-      </PhpSpecSuiteConfiguration>
-      <PhpSpecSuiteConfiguration>
-        <option name="myPath" value="$PROJECT_DIR$" />
-      </PhpSpecSuiteConfiguration>
-    </suites>
-  </component>
-</project>
\ No newline at end of file
diff --git a/.idea/phpunit.xml b/.idea/phpunit.xml
deleted file mode 100644
index 4f8104c..0000000
--- a/.idea/phpunit.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="PHPUnit">
-    <option name="directories">
-      <list>
-        <option value="$PROJECT_DIR$/tests" />
-      </list>
-    </option>
-  </component>
-</project>
\ No newline at end of file
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
index 8306744..35eb1dd 100644
--- a/.idea/vcs.xml
+++ b/.idea/vcs.xml
@@ -2,6 +2,5 @@
 <project version="4">
   <component name="VcsDirectoryMappings">
     <mapping directory="" vcs="Git" />
-    <mapping directory="$PROJECT_DIR$" vcs="Git" />
   </component>
 </project>
\ No newline at end of file
diff --git a/composer.lock b/composer.lock
index ba7dfde..1b8c104 100644
--- a/composer.lock
+++ b/composer.lock
@@ -198,7 +198,7 @@
             "source": {
                 "type": "git",
                 "url": "https://git.univ-reunion.fr/sda-php/nulib-tests.git",
-                "reference": "8902035bef6ddfe9864675a00844dd14872f6d13"
+                "reference": "6758a43c241cf51ab3ecff3d2260a583f20c0b19"
             },
             "require": {
                 "php": ">=7.3",
@@ -207,12 +207,12 @@
             "type": "library",
             "autoload": {
                 "psr-4": {
-                    "mur\\tests\\": "src"
+                    "nulib\\tests\\": "src"
                 }
             },
             "autoload-dev": {
                 "psr-4": {
-                    "mur\\tests\\": "tests"
+                    "nulib\\tests\\": "tests"
                 }
             },
             "authors": [
@@ -222,7 +222,7 @@
                 }
             ],
             "description": "fonctions et classes pour les tests",
-            "time": "2023-10-01T11:57:55+00:00"
+            "time": "2023-10-20T06:17:30+00:00"
         },
         {
             "name": "phar-io/manifest",
diff --git a/php/src_base/cl.php b/php/src_base/cl.php
index 960abde..4d85ded 100644
--- a/php/src_base/cl.php
+++ b/php/src_base/cl.php
@@ -445,10 +445,10 @@ class cl {
   static final function compare(array $keys): callable {
     return function ($a, $b) use ($keys) {
       foreach ($keys as $key) {
-        if (cstr::del_prefix($key, "+")) $w = 1;
-        elseif (cstr::del_prefix($key, "-")) $w = -1;
-        elseif (cstr::del_suffix($key, "|asc")) $w = 1;
-        elseif (cstr::del_suffix($key, "|desc")) $w = -1;
+        if (str::del_prefix($key, "+")) $w = 1;
+        elseif (str::del_prefix($key, "-")) $w = -1;
+        elseif (str::del_suffix($key, "|asc")) $w = 1;
+        elseif (str::del_suffix($key, "|desc")) $w = -1;
         else $w = 1;
         if ($c = $w * cv::compare(cl::get($a, $key), cl::get($b, $key))) {
           return $c;
diff --git a/php/src_base/cstr.php b/php/src_base/str.php
similarity index 99%
rename from php/src_base/cstr.php
rename to php/src_base/str.php
index 85a1957..ecbb538 100644
--- a/php/src_base/cstr.php
+++ b/php/src_base/str.php
@@ -2,9 +2,9 @@
 namespace nulib;
 
 /**
- * Class cstr: gestion des chaines de caractère "simples"
+ * Class str: gestion des chaines de caractère "simples"
  */
-class cstr {
+class str {
   /**
    * Retourner $s converti en chaine non nulle, ou "" si $s est fausse (cela
    * n'inclue pas la chaine "0")
diff --git a/php/tests/cstrTest.php b/php/tests/cstrTest.php
deleted file mode 100644
index 132a538..0000000
--- a/php/tests/cstrTest.php
+++ /dev/null
@@ -1,56 +0,0 @@
-<?php
-namespace nulib;
-
-use mur\tests\TestCase;
-
-class cstrTest extends TestCase {
-  function testSplit_pair() {
-    self::assertSame([null, null], cstr::split_pair(null));
-    self::assertSame(["", null], cstr::split_pair(""));
-    self::assertSame(["first", null], cstr::split_pair("first"));
-    self::assertSame(["first", ""], cstr::split_pair("first:"));
-    self::assertSame(["first", "second"], cstr::split_pair("first:second"));
-    self::assertSame(["first", "second:third"], cstr::split_pair("first:second:third"));
-  }
-
-  function testXxxSuffix() {
-    $s = "blahSUF";
-    self::assertTrue(cstr::del_suffix($s, "SUF"));
-    self::assertSame("blah", $s);
-    self::assertFalse(cstr::del_suffix($s, "SUF"));
-
-    self::assertTrue(cstr::add_suffix($s, "SUF"));
-    self::assertSame("blahSUF", $s);
-    self::assertFalse(cstr::add_suffix($s, "SUF"));
-  }
-
-  function testXxxPrefix() {
-    $s = "PREblah";
-    self::assertTrue(cstr::del_prefix($s, "PRE"));
-    self::assertSame("blah", $s);
-    self::assertFalse(cstr::del_prefix($s, "PRE"));
-
-    self::assertTrue(cstr::add_prefix($s, "PRE"));
-    self::assertSame("PREblah", $s);
-    self::assertFalse(cstr::add_prefix($s, "PRE"));
-  }
-
-  function testUs2camel() {
-    # avec délimiteur
-    self::assertSame("myCamel", cstr::us2camel("my_camel"));
-    self::assertSame("myCamel", cstr::us2camel("MY_CAMEL"));
-    self::assertSame("myCamel", cstr::us2camel("My_Camel"));
-    self::assertSame("myCamel", cstr::us2camel("mY_cAMEL"));
-    self::assertSame("myCamel", cstr::us2camel("my-camel"));
-    self::assertSame("myCamel", cstr::us2camel("my camel"));
-    self::assertSame("myCamel", cstr::us2camel("my\tcamel"));
-    self::assertSame("myCamel", cstr::us2camel("my\rcamel"));
-    self::assertSame("myCamel", cstr::us2camel("my\ncamel"));
-    self::assertSame("myCamel", cstr::us2camel("my\fcamel"));
-    self::assertSame("myCamel", cstr::us2camel("my\vcamel"));
-    # sans délimiteur
-    self::assertSame("myCamel", cstr::us2camel("myCamel"));
-    self::assertSame("MyCamel", cstr::us2camel("MyCamel"));
-    self::assertSame("MyCaMEL", cstr::us2camel("MyCaMEL"));
-  }
-}
diff --git a/php/tests/strTest.php b/php/tests/strTest.php
new file mode 100644
index 0000000..ce654b1
--- /dev/null
+++ b/php/tests/strTest.php
@@ -0,0 +1,56 @@
+<?php
+namespace nulib;
+
+use nulib\tests\TestCase;
+
+class strTest extends TestCase {
+  function testSplit_pair() {
+    self::assertSame([null, null], str::split_pair(null));
+    self::assertSame(["", null], str::split_pair(""));
+    self::assertSame(["first", null], str::split_pair("first"));
+    self::assertSame(["first", ""], str::split_pair("first:"));
+    self::assertSame(["first", "second"], str::split_pair("first:second"));
+    self::assertSame(["first", "second:third"], str::split_pair("first:second:third"));
+  }
+
+  function testXxxSuffix() {
+    $s = "blahSUF";
+    self::assertTrue(str::del_suffix($s, "SUF"));
+    self::assertSame("blah", $s);
+    self::assertFalse(str::del_suffix($s, "SUF"));
+
+    self::assertTrue(str::add_suffix($s, "SUF"));
+    self::assertSame("blahSUF", $s);
+    self::assertFalse(str::add_suffix($s, "SUF"));
+  }
+
+  function testXxxPrefix() {
+    $s = "PREblah";
+    self::assertTrue(str::del_prefix($s, "PRE"));
+    self::assertSame("blah", $s);
+    self::assertFalse(str::del_prefix($s, "PRE"));
+
+    self::assertTrue(str::add_prefix($s, "PRE"));
+    self::assertSame("PREblah", $s);
+    self::assertFalse(str::add_prefix($s, "PRE"));
+  }
+
+  function testUs2camel() {
+    # avec délimiteur
+    self::assertSame("myCamel", str::us2camel("my_camel"));
+    self::assertSame("myCamel", str::us2camel("MY_CAMEL"));
+    self::assertSame("myCamel", str::us2camel("My_Camel"));
+    self::assertSame("myCamel", str::us2camel("mY_cAMEL"));
+    self::assertSame("myCamel", str::us2camel("my-camel"));
+    self::assertSame("myCamel", str::us2camel("my camel"));
+    self::assertSame("myCamel", str::us2camel("my\tcamel"));
+    self::assertSame("myCamel", str::us2camel("my\rcamel"));
+    self::assertSame("myCamel", str::us2camel("my\ncamel"));
+    self::assertSame("myCamel", str::us2camel("my\fcamel"));
+    self::assertSame("myCamel", str::us2camel("my\vcamel"));
+    # sans délimiteur
+    self::assertSame("myCamel", str::us2camel("myCamel"));
+    self::assertSame("MyCamel", str::us2camel("MyCamel"));
+    self::assertSame("MyCaMEL", str::us2camel("MyCaMEL"));
+  }
+}