fix namespace

cyklokoalicia · Feb 25, 2024 · 58efd13 · 58efd13
1 parent fd9026b
commit 58efd13
Show file tree

Hide file tree

Showing 16 changed files with 63 additions and 40 deletions.
diff --git a/actions-sms.php b/actions-sms.php
@@ -1,5 +1,8 @@
 <?php
 
+use BikeShare\Db\DbInterface;
+use BikeShare\Db\MysqliDb;
+
 require_once 'vendor/autoload.php';
 require("common.php");
 
@@ -499,9 +502,9 @@ function log_sms($sms_uuid, $sender, $receive_time, $sms_text, $ip)
 {
     global $dbserver, $dbuser, $dbpassword, $dbname;
     /**
-     * @var \Bikeshare\Db\DbInterface
+     * @var DbInterface
      */
-    $localdb = new \Bikeshare\Db\MysqliDb($dbserver, $dbuser, $dbpassword, $dbname);
+    $localdb = new MysqliDb($dbserver, $dbuser, $dbpassword, $dbname);
     $localdb->connect();
 
     #TODO does it needed???

diff --git a/admin.php b/admin.php
@@ -1,13 +1,14 @@
 <?php
 
-use Bikeshare\Db\MysqliDb;
+use BikeShare\Db\DbInterface;
+use BikeShare\Db\MysqliDb;
 
 require_once 'vendor/autoload.php';
 require("config.php");
 require('actions-web.php');
 
 /**
- * @var \Bikeshare\Db\DbInterface
+ * @var DbInterface
  */
 $db=new MysqliDb($dbserver,$dbuser,$dbpassword,$dbname);
 $db->connect();

diff --git a/agree.php b/agree.php
@@ -1,13 +1,14 @@
 <?php
 
-use Bikeshare\Db\MysqliDb;
+use BikeShare\Db\DbInterface;
+use BikeShare\Db\MysqliDb;
 
 require_once 'vendor/autoload.php';
 require("config.php");
 require('actions-web.php');
 
 /**
- * @var \Bikeshare\Db\DbInterface
+ * @var DbInterface
  */
 $db=new MysqliDb($dbserver,$dbuser,$dbpassword,$dbname);
 $db->connect();

diff --git a/command.php b/command.php
@@ -1,13 +1,14 @@
 <?php
 
-use Bikeshare\Db\MysqliDb;
+use BikeShare\Db\DbInterface;
+use BikeShare\Db\MysqliDb;
 
 require_once 'vendor/autoload.php';
 require("config.php");
 require('actions-web.php');
 
 /**
- * @var \Bikeshare\Db\DbInterface
+ * @var DbInterface
  */
 $db=new MysqliDb($dbserver,$dbuser,$dbpassword,$dbname);
 $db->connect();

diff --git a/common.php b/common.php
@@ -1,5 +1,7 @@
 <?php
 
+use BikeShare\Db\DbInterface;
+use BikeShare\Db\MysqliDb;
 use BikeShare\SmsConnector\SmsConnectorFactory;
 
 require_once 'vendor/autoload.php';
@@ -95,9 +97,9 @@ function log_sendsms($number, $text)
 {
     global $dbserver, $dbuser, $dbpassword, $dbname;
     /**
-     * @var \Bikeshare\Db\DbInterface
+     * @var DbInterface
      */
-    $localdb = new \Bikeshare\Db\MysqliDb($dbserver, $dbuser, $dbpassword, $dbname);
+    $localdb = new MysqliDb($dbserver, $dbuser, $dbpassword, $dbname);
     $localdb->connect();
 
     #TODO does it needed???
@@ -226,9 +228,9 @@ function logrequest($userid)
 {
    global $dbserver,$dbuser,$dbpassword,$dbname;
     /**
-     * @var \Bikeshare\Db\DbInterface
+     * @var DbInterface
      */
-    $localdb = new \Bikeshare\Db\MysqliDb($dbserver, $dbuser, $dbpassword, $dbname);
+    $localdb = new MysqliDb($dbserver, $dbuser, $dbpassword, $dbname);
     $localdb->connect();
 
     #TODO does it needed???
@@ -245,9 +247,9 @@ function logresult($userid,$text)
    global $dbserver,$dbuser,$dbpassword,$dbname;
 
     /**
-     * @var \Bikeshare\Db\DbInterface
+     * @var DbInterface
      */
-    $localdb = new \Bikeshare\Db\MysqliDb($dbserver, $dbuser, $dbpassword, $dbname);
+    $localdb = new MysqliDb($dbserver, $dbuser, $dbpassword, $dbname);
     $localdb->connect();
 
     #TODO does it needed???

diff --git a/cron.php b/cron.php
@@ -1,13 +1,16 @@
 <?php
 
+use BikeShare\Db\DbInterface;
+use BikeShare\Db\MysqliDb;
+
 require_once 'vendor/autoload.php';
 require("config.php");
 require("actions-web.php");
 
 /**
- * @var \Bikeshare\Db\DbInterface
+ * @var DbInterface
  */
-$db=new \Bikeshare\Db\MysqliDb($dbserver,$dbuser,$dbpassword,$dbname);
+$db=new MysqliDb($dbserver,$dbuser,$dbpassword,$dbname);
 $db->connect();
 
 checklongrental();

diff --git a/index.php b/index.php
@@ -1,13 +1,14 @@
 <?php
 
-use Bikeshare\Db\MysqliDb;
+use BikeShare\Db\DbInterface;
+use BikeShare\Db\MysqliDb;
 
 require_once 'vendor/autoload.php';
 require "config.php";
 require "actions-web.php";
 
 /**
- * @var \Bikeshare\Db\DbInterface
+ * @var DbInterface
  */
 $db=new MysqliDb($dbserver,$dbuser,$dbpassword,$dbname);
 $db->connect();

diff --git a/install/generate.php b/install/generate.php
@@ -1,5 +1,8 @@
 <?php
 
+use BikeShare\Db\DbInterface;
+use BikeShare\Db\MysqliDb;
+
 require_once '../vendor/autoload.php';
 if (file_exists("../config.php")) {
     require "../config.php";
@@ -8,9 +11,9 @@
 }
 
 /**
- * @var \Bikeshare\Db\DbInterface
+ * @var DbInterface
  */
-$db=new \Bikeshare\Db\MysqliDb($dbserver,$dbuser,$dbpassword,$dbname);
+$db=new MysqliDb($dbserver,$dbuser,$dbpassword,$dbname);
 $db->connect();
 
 // create new PDF document

diff --git a/install/index.php b/install/index.php
@@ -1,6 +1,9 @@
 <?php
 //@TODO ANaLYTICS!!!
 
+use BikeShare\Db\DbInterface;
+use BikeShare\Db\MysqliDb;
+
 if (file_exists("../config.php")) {
     exit("Project already installed. If you want to reinstall, please remove config.php file.");
 }
@@ -205,9 +208,9 @@ function return_bytes($val) {
 $newconfig=implode($configfile);
 file_put_contents($configfilename,$newconfig);
 /**
- * @var \Bikeshare\Db\DbInterface
+ * @var DbInterface
  */
-$db=new \Bikeshare\Db\MysqliDb($_POST["dbserver"],$_POST["dbuser"],$_POST["dbpassword"],$_POST["dbname"]);
+$db=new MysqliDb($_POST["dbserver"],$_POST["dbuser"],$_POST["dbpassword"],$_POST["dbname"]);
 $db->connect();
 $sql=file_get_contents("../docker-data/mysql/create-database.sql");
 $sql=explode(";",$sql);
@@ -236,9 +239,9 @@ function return_bytes($val) {
 <?php endif; ?>
 <?php if ($step==3):
 /**
- * @var \Bikeshare\Db\DbInterface
+ * @var DbInterface
  */
-$db=new \Bikeshare\Db\MysqliDb($dbserver,$dbuser,$dbpassword,$dbname);
+$db=new MysqliDb($dbserver,$dbuser,$dbpassword,$dbname);
 $db->connect();
 $result=$db->query("REPLACE INTO users SET userName='".$_POST["username"]."',password=SHA2('".$_POST["password"]."',512),mail='".$_POST["email"]."',number='".$_POST["phone"]."',privileges=7");
 $userid=$db->getLastInsertId();
@@ -260,9 +263,9 @@ function return_bytes($val) {
 <?php endif; ?>
 <?php if ($step==4):
 /**
- * @var \Bikeshare\Db\DbInterface
+ * @var DbInterface
  */
-$db=new \Bikeshare\Db\MysqliDb($dbserver,$dbuser,$dbpassword,$dbname);
+$db=new MysqliDb($dbserver,$dbuser,$dbpassword,$dbname);
 $db->connect();
 $stands=explode(",",$_POST["stands"]);
 foreach ($stands as $stand)
@@ -326,9 +329,9 @@ function return_bytes($val) {
 <?php endif; ?>
 <?php if ($step==5):
 /**
- * @var \Bikeshare\Db\DbInterface
+ * @var DbInterface
  */
-$db=new \Bikeshare\Db\MysqliDb($dbserver,$dbuser,$dbpassword,$dbname);
+$db=new MysqliDb($dbserver,$dbuser,$dbpassword,$dbname);
 $db->connect();
 ?>
       <h2>Set system options</h2>
@@ -398,9 +401,9 @@ function return_bytes($val) {
 <?php endif; ?>
 <?php if ($step==6):
 /**
- * @var \Bikeshare\Db\DbInterface
+ * @var DbInterface
  */
-$db=new \Bikeshare\Db\MysqliDb($dbserver,$dbuser,$dbpassword,$dbname);
+$db=new MysqliDb($dbserver,$dbuser,$dbpassword,$dbname);
 $db->connect();
 $configfile=file($configfilename);
 foreach ($_POST as $variable=>$value)

diff --git a/receive.php b/receive.php
@@ -1,14 +1,16 @@
 <?php
 
+use BikeShare\Db\DbInterface;
+use BikeShare\Db\MysqliDb;
 use BikeShare\SmsConnector\SmsConnectorInterface;
 
 require_once 'vendor/autoload.php';
 require("config.php");
 
 /**
- * @var \Bikeshare\Db\DbInterface
+ * @var DbInterface
  */
-$db=new \Bikeshare\Db\MysqliDb($dbserver,$dbuser,$dbpassword,$dbname);
+$db=new MysqliDb($dbserver,$dbuser,$dbpassword,$dbname);
 $db->connect();
 
 require("actions-sms.php");

diff --git a/scan.php b/scan.php
@@ -1,13 +1,16 @@
 <?php
 
+use BikeShare\Db\DbInterface;
+use BikeShare\Db\MysqliDb;
+
 require_once 'vendor/autoload.php';
 require("config.php");
 require('actions-qrcode.php');
 
 /**
- * @var \Bikeshare\Db\DbInterface
+ * @var DbInterface
  */
-$db=new \Bikeshare\Db\MysqliDb($dbserver,$dbuser,$dbpassword,$dbname);
+$db=new MysqliDb($dbserver,$dbuser,$dbpassword,$dbname);
 $db->connect();
 
 if (isset($_COOKIE["loguserid"])) {

diff --git a/src/Db/DbInterface.php b/src/Db/DbInterface.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Bikeshare\Db;
+namespace BikeShare\Db;
 
 interface DbInterface
 {

diff --git a/src/Db/MysqliDb.php b/src/Db/MysqliDb.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Bikeshare\Db;
+namespace BikeShare\Db;
 
 class MysqliDb implements DbInterface
 {

diff --git a/src/SmsConnector/SmsGatewayConnector.php b/src/SmsConnector/SmsGatewayConnector.php
@@ -11,7 +11,7 @@
 
 namespace BikeShare\SmsConnector;
 
-use Bikeshare\SmsConnector\SmsGateway\SmsGateway;
+use BikeShare\SmsConnector\SmsGateway\SmsGateway;
 
 class SmsGatewayConnector extends AbstractConnector
 {

diff --git a/tests/Db/MysqliDbTest.php b/tests/Db/MysqliDbTest.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Test\Bikeshare\Db;
+namespace Test\BikeShare\Db;
 
-use Bikeshare\Db\MysqliDb;
+use BikeShare\Db\MysqliDb;
 use PHPUnit\Framework\TestCase;
 
 class MysqliDbTest extends TestCase

diff --git a/tests/SmsConnector/SmsConnectorFactory.php b/tests/SmsConnector/SmsConnectorFactory.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Test\Bikeshare\SmsConnector;
+namespace Test\BikeShare\SmsConnector;
 
 use BikeShare\SmsConnector\DisabledConnector;
 use BikeShare\SmsConnector\EuroSmsConnector;