On Server Realpath fix

Fredrick Peter · Fredrick Peter · commit 162e090dad5d · 2023-05-05T23:33:16.000+01:00
diff --git a/README.md b/README.md
@@ -104,7 +104,7 @@ Prior to installing `php-orm-database` get the [Composer](https://getcomposer.or
 **Step 1** — update your `composer.json`:
 ```composer.json
 "require": {
-    "peterson/php-orm-database": "^2.2.9" 
+    "peterson/php-orm-database": "^3.0.1" 
 }
 ```
 
diff --git a/composer.json b/composer.json
@@ -37,7 +37,7 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-main": "2.2.9-dev"
+            "dev-main": "3.0.1-dev"
         }
     },
     "minimum-stability": "stable",
diff --git a/src/AutoloadEnv.php b/src/AutoloadEnv.php
@@ -188,75 +188,134 @@ static public function configurePagination(?array $options = [])
      */
     static protected function createDummy()
     {
-        $realPath = DOT_ENV_CONNECTION['self_path']['path'];
-        $paths = [
-            'init' => [
-                'path'  => "{$realPath}\init.php",
-                'dummy' => realpath(__DIR__) . "\Dummy\dummyInit.php",
-            ],
-            'gitignore' => [
-                'path'  => "{$realPath}\.gitignore",
-                'dummy' => realpath(__DIR__) . "\Dummy\dummyGitIgnore.php",
-            ],
-            'htaccess' => [
-                'path'  => "{$realPath}\.htaccess",
-                'dummy' => realpath(__DIR__) . "\Dummy\dummyHtaccess.php",
-            ],
-            'phpini' => [
-                'path'  => "{$realPath}\php.ini",
-                'dummy' => realpath(__DIR__) . "\Dummy\dummyPhpIni.php",
-            ],
-            'userini' => [
-                'path'  => "{$realPath}\.user.ini",
-                'dummy' => realpath(__DIR__) . "\Dummy\dummyUserIni.php",
-            ],
-        ];
+        $paths = self::getPathsData();
 
-        // create for init 
-        if(!file_exists($paths['init']['path']) && !is_dir($paths['init']['path'])){
-            @$fsource = fopen($paths['init']['path'], 'w+s');
-            if(is_resource($fsource)){
-                @fwrite($fsource, file_get_contents($paths['init']['dummy']));
-                @fclose($fsource);
+        // only create when files are not present
+        if(self::isDummyNotPresent()){
+            // create for init 
+            if(!file_exists($paths['init']['path']) && !is_dir($paths['init']['path'])){
+                // Read the contents of the dummy file
+                $dummyContent = file_get_contents($paths['init']['dummy']);
+    
+                // Write the contents to the new file
+                file_put_contents($paths['init']['path'], $dummyContent);
+            }
+    
+            // create for gitignore
+            if(!file_exists($paths['gitignore']['path']) && !is_dir($paths['gitignore']['path'])){
+                // Read the contents of the dummy file
+                $dummyContent = file_get_contents($paths['gitignore']['dummy']);
+    
+                // Write the contents to the new file
+                file_put_contents($paths['gitignore']['path'], $dummyContent);
+            }
+    
+            // create for htaccess
+            if(!file_exists($paths['htaccess']['path']) && !is_dir($paths['htaccess']['path'])){
+                // Read the contents of the dummy file
+                $dummyContent = file_get_contents($paths['htaccess']['dummy']);
+    
+                // Write the contents to the new file
+                file_put_contents($paths['htaccess']['path'], $dummyContent);
+            }
+    
+            // create for phpini
+            if(!file_exists($paths['phpini']['path']) && !is_dir($paths['phpini']['path'])){
+                // Read the contents of the dummy file
+                $dummyContent = file_get_contents($paths['phpini']['dummy']);
+    
+                // Write the contents to the new file
+                file_put_contents($paths['phpini']['path'], $dummyContent);
+            }
+    
+            // create for userini
+            if(!file_exists($paths['userini']['path']) && !is_dir($paths['userini']['path'])){
+                // Read the contents of the dummy file
+                $dummyContent = file_get_contents($paths['userini']['dummy']);
+    
+                // Write the contents to the new file
+                file_put_contents($paths['userini']['path'], $dummyContent);
             }
         }
+    }
+
+    /**
+     * Check if dummy data is present
+     * 
+     * @return bool
+     */
+    static private function isDummyNotPresent()
+    {
+        $paths = self::getPathsData();
+        $present = [false];
+
+        // create for init 
+        if(file_exists($paths['init']['path']) && !is_dir($paths['init']['path'])){
+            $present[] = true;
+        }
 
         // create for gitignore
-        if(!file_exists($paths['gitignore']['path']) && !is_dir($paths['gitignore']['path'])){
-            @$fsource = fopen($paths['gitignore']['path'], 'w+s');
-            if(is_resource($fsource)){
-                @fwrite($fsource, file_get_contents($paths['gitignore']['dummy']));
-                @fclose($fsource);
-            }
+        if(file_exists($paths['gitignore']['path']) && !is_dir($paths['gitignore']['path'])){
+            $present[] = true;
         }
 
         // create for htaccess
-        if(!file_exists($paths['htaccess']['path']) && !is_dir($paths['htaccess']['path'])){
-            @$fsource = fopen($paths['htaccess']['path'], 'w+s');
-            if(is_resource($fsource)){
-                @fwrite($fsource, file_get_contents($paths['htaccess']['dummy']));
-                @fclose($fsource);
-            }
+        if(file_exists($paths['htaccess']['path']) && !is_dir($paths['htaccess']['path'])){
+            $present[] = true;
         }
 
         // create for phpini
-        if(!file_exists($paths['phpini']['path']) && !is_dir($paths['phpini']['path'])){
-            @$fsource = fopen($paths['phpini']['path'], 'w+s');
-            if(is_resource($fsource)){
-                @fwrite($fsource, file_get_contents($paths['phpini']['dummy']));
-                @fclose($fsource);
-            }
+        if(file_exists($paths['phpini']['path']) && !is_dir($paths['phpini']['path'])){
+            $present[] = true;
         }
 
         // create for userini
-        if(!file_exists($paths['userini']['path']) && !is_dir($paths['userini']['path'])){
-            @$fsource = fopen($paths['userini']['path'], 'w+s');
-            if(is_resource($fsource)){
-                @fwrite($fsource, file_get_contents($paths['userini']['dummy']));
-                @fclose($fsource);
-            }
+        if(file_exists($paths['userini']['path']) && !is_dir($paths['userini']['path'])){
+            $present[] = true;
         }
 
+        // Check if all elements in $present are false
+        $allFalse = empty(array_filter($present));
+
+        // All elements in $present are false
+        if ($allFalse) {
+            return false;
+        } 
+
+        return true;
+    }
+
+    /**
+     * Get all dummy contents path data
+     * 
+     * @return array
+     */
+    static private function getPathsData()
+    {
+        $serverPath = DOT_ENV_CONNECTION['self_path']['path'];
+        $realPath   = str_replace('\\', '/', rtrim(realpath(__DIR__), "/\\"));
+        return [
+            'init' => [
+                'path'  => "{$serverPath}init.php",
+                'dummy' => "{$realPath}/Dummy/dummyInit.php",
+            ],
+            'gitignore' => [
+                'path'  => "{$serverPath}\.gitignore",
+                'dummy' => "{$realPath}/Dummy/dummyGitIgnore.php",
+            ],
+            'htaccess' => [
+                'path'  => "{$serverPath}\.htaccess",
+                'dummy' => "{$realPath}/Dummy/dummyHtaccess.php",
+            ],
+            'phpini' => [
+                'path'  => "{$serverPath}\php.ini",
+                'dummy' => "{$realPath}/Dummy/dummyPhpIni.php",
+            ],
+            'userini' => [
+                'path'  => "{$serverPath}\.user.ini",
+                'dummy' => "{$realPath}/Dummy/dummyUserIni.php",
+            ],
+        ];
     }
     
 }
diff --git a/src/Capsule/AppManager.php b/src/Capsule/AppManager.php
@@ -10,9 +10,7 @@
 
 class AppManager extends Constants{
     
-
     static private $year;
-    
 
     static function initAppManager() 
     {
@@ -68,10 +66,9 @@ static public function envDummy()
             PUSHER_SCHEME=https
             PUSHER_APP_CLUSTER=mt1
             
-            #ORM Model Builder
-            #©Copyright - '. self::$year .'
-            APP_DEVELOPER="Fredrick Peterson"
-            APP_DEVELOPER_EMAIL="tamedevelopers@gmail.com"
+            #©Copyright '. self::$year .'
+            APP_DEVELOPER=
+            APP_DEVELOPER_EMAIL=
         ');
     }
 
diff --git a/src/Migrations/Migration.php b/src/Migrations/Migration.php
@@ -57,16 +57,13 @@ static private function initBaseDirectory()
 
             // create file if not exist
             if (!file_exists($gitignore) && !is_dir($gitignore)) {
-                @$fsource = fopen($gitignore, 'w+');
-                if(is_resource($fsource)){
-                    fwrite($fsource, preg_replace(
-                        '/^[ \t]+|[ \t]+$/m', '', 
-                        ".
-                        /database
-                        .env"
-                    ));
-                    fclose($fsource);
-                }
+                // Write the contents to the new file
+                file_put_contents($gitignore, preg_replace(
+                    '/^[ \t]+|[ \t]+$/m', '', 
+                    ".
+                    /database
+                    .env"
+                ));
             }
         }
 
@@ -142,17 +139,20 @@ static public function create(?string $table_name, ?string $type = null)
         // Date convert
         $fileName = sprintf( "%s_%s_%s", date('Y_m_d'), strtotime('today'), "{$case_table}.php" );
 
+        // real path
+        $realPath   = str_replace('\\', '/', rtrim(realpath(__DIR__), "/\\"));
+
         // get directory
-        $dummyPath = realpath(__DIR__) . "\..\Dummy\dummyMigration.php";
+        $dummyPath = "{$realPath}/../Dummy/dummyMigration.php";
 
 
         // If type creation passed
         if(!empty($type) && in_array(strtolower($type), ['job', 'jobs'])){
             // create a jobs table
-            $dummyPath = realpath(__DIR__) . "\..\Dummy\dummyJobsMigration.php";
+            $dummyPath = "{$realPath}/../Dummy/dummyJobsMigration.php";
         } elseif(!empty($type) && in_array(strtolower($type), ['session', 'sessions'])){
             // create a sessions table
-            $dummyPath = realpath(__DIR__) . "\..\Dummy\dummySessionsMigration.php";
+            $dummyPath = "{$realPath}/../Dummy/dummySessionsMigration.php";
         }
 
         // dummy content
@@ -173,11 +173,8 @@ static public function create(?string $table_name, ?string $type = null)
         }
 
         // start writting
-        @$fsource = fopen($absoluteFile, 'w+s');
-        if(is_resource($fsource)){
-            @fwrite($fsource, $dummyContent );
-            @fclose($fsource);
-        }
+        // Write the contents to the new file
+        file_put_contents($absoluteFile, $dummyContent);
 
         echo sprintf("Table `%s` has been created
                     <span style='background: #027b02; {$style}'> 
diff --git a/src/Schema/OrmDotEnv.php b/src/Schema/OrmDotEnv.php
@@ -124,11 +124,9 @@ static public function createOrIgnore()
         
         // if file doesn't exist and not a directory
         if(!file_exists($path) && !is_dir($path)){
-            @$fsource = fopen($path, 'w+');
-            if(is_resource($fsource)){
-                @fwrite($fsource, self::envTxt());
-                @fclose($fsource);
-            }
+            
+            // Write the contents to the new file
+            file_put_contents($path, self::envTxt());
         }
     }
 

Original file line number	Diff line number	Diff line change
@@ -104,7 +104,7 @@ Prior to installing `php-orm-database` get the [Composer](https://getcomposer.or
`104`	`104`	Step 1 — update your `composer.json`:
`105`	`105`	```composer.json
`106`	`106`	`"require": {`
`107`		`- "peterson/php-orm-database": "^2.2.9"`
	`107`	`+ "peterson/php-orm-database": "^3.0.1"`
`108`	`108`	`}`
`109`	`109`	```
`110`	`110`
Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@`
`37`	`37`	`},`
`38`	`38`	`"extra": {`
`39`	`39`	`"branch-alias": {`
`40`		`- "dev-main": "2.2.9-dev"`
	`40`	`+ "dev-main": "3.0.1-dev"`
`41`	`41`	`}`
`42`	`42`	`},`
`43`	`43`	`"minimum-stability": "stable",`
Original file line number	Diff line number	Diff line change
`@@ -124,11 +124,9 @@ static public function createOrIgnore()`
`124`	`124`
`125`	`125`	`// if file doesn't exist and not a directory`
`126`	`126`	`if(!file_exists($path) && !is_dir($path)){`
`127`		`- @$fsource = fopen($path, 'w+');`
`128`		`- if(is_resource($fsource)){`
`129`		`- @fwrite($fsource, self::envTxt());`
`130`		`- @fclose($fsource);`
`131`		`- }`
	`127`	`+`
	`128`	`+ // Write the contents to the new file`
	`129`	`+ file_put_contents($path, self::envTxt());`
`132`	`130`	`}`
`133`	`131`	`}`
`134`	`132`