update PHP requirements and documentation

rosasurfer · Jul 31, 2024 · da70a9a · da70a9a
1 parent cfac20a
commit da70a9a
Show file tree

Hide file tree

Showing 16 changed files with 52 additions and 45 deletions.
diff --git a/.gitignore b/.gitignore
@@ -30,4 +30,5 @@ vendor/
 config.*properties
 !config.dist.properties
 
+/etc/httpd/cgi-bin/php.ini
 /php-error.log
diff --git a/README.md b/README.md
@@ -1,8 +1,6 @@
 MiniStruts
 ----------
-Java Struts inspired MVC micro framework for PHP
+MVC micro framework for PHP inspired by Java Struts
 
-[![Build Status](https://scrutinizer-ci.com/g/rosasurfer/ministruts/badges/build.png?b=master)](https://scrutinizer-ci.com/g/rosasurfer/ministruts/build-status/master)
-[![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/rosasurfer/ministruts/badges/quality-score.png?b=master)](https://scrutinizer-ci.com/g/rosasurfer/ministruts/?branch=master)
-[![PHPStan Code Quality](https://img.shields.io/badge/PHPStan-level_7-brightgreen.svg?style=flat)](https://github.com/phpstan/phpstan)
-[![Codacy Badge](https://api.codacy.com/project/badge/Grade/89ae4863ef60444ab2054db45a217268)](https://www.codacy.com/app/rosasurfer/ministruts)
+[![Build Status](https://scrutinizer-ci.com/g/rosasurfer/ministruts/badges/build.png?b=0.8)](https://scrutinizer-ci.com/g/rosasurfer/ministruts/build-status/0.8)
+[![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/rosasurfer/ministruts/badges/quality-score.png?b=0.8)](https://scrutinizer-ci.com/g/rosasurfer/ministruts/?branch=0.8)
diff --git a/composer.json b/composer.json
@@ -1,16 +1,13 @@
 {
     "name":        "rosasurfer/ministruts",
-    "description": "Java Struts inspired MVC micro framework for PHP",
+    "description": "MVC micro framework inspired by Java Struts",
     "type":        "library",
     "license":     "WTFPL",
     "authors": [{
         "name":  "Peter Walther",
         "email": "[email protected]"
     }],
     "config": {
-        "platform": {
-            "php": "5.6.40"
-        },
         "optimize-autoloader": true
     },
     "require": {

diff --git a/etc/httpd/templates/apache22-php-fcgi.conf → etc/httpd/apache22-php-fcgi.conf b/etc/httpd/templates/apache22-php-fcgi.conf → etc/httpd/apache22-php-fcgi.conf
@@ -19,11 +19,11 @@
         Deny from all
     </Directory>
     <Directory "${SITES}/example.ministruts.com/web">
-        # (1) public access, .htaccess disabled or...
+        # public access, .htaccess disabled or...
         Order allow,deny
         Allow from all
 
-        # (2) ...restricted access, .htaccess enabled
+        # ...restricted access, .htaccess enabled
         Order deny,allow
         Deny  from all
         Allow from 127.0.0.1
@@ -47,7 +47,7 @@
     <Files "*.php">
         Options      +ExecCGI
         SetHandler   fcgid-script
-        FcgidWrapper "${SITES}/example.ministruts.com/etc/httpd/templates/cgi-bin/php56-wrapper" .php
+        FcgidWrapper "${SITES}/example.ministruts.com/etc/httpd/cgi-bin/php56-wrapper" .php
     </Files>
     <IfModule mod_suexec.c>
         # With mod_suexec FcgidWrapper must point to a permitted executable (see suexec -V).
@@ -78,11 +78,11 @@
         Deny from all
     </Directory>
     <Directory "${SITES}/example.ministruts.com/web">
-        # (1) public access, .htaccess disabled or...
+        # public access, .htaccess disabled or...
         Order allow,deny
         Allow from all
 
-        # (2) ...restricted access, .htaccess enabled
+        # ...restricted access, .htaccess enabled
         Order deny,allow
         Deny  from all
         Allow from 127.0.0.1
@@ -106,7 +106,7 @@
     <Files "*.php">
         Options      +ExecCGI
         SetHandler   fcgid-script
-        FcgidWrapper "${SITES}/example.ministruts.com/etc/httpd/templates/cgi-bin/php56-wrapper" .php
+        FcgidWrapper "${SITES}/example.ministruts.com/etc/httpd/cgi-bin/php56-wrapper" .php
     </Files>
     <IfModule mod_suexec.c>
         # With mod_suexec FcgidWrapper must point to a permitted executable (see suexec -V).
@@ -116,7 +116,7 @@
     SSLEngine             on
     SSLProtocol           all -SSLv2
     SSLCipherSuite        HIGH:MEDIUM
-    SSLCertificateFile    "${SITES}/example.ministruts.com/etc/httpd/templates/ssl/example.ministruts.com.crt"
-    SSLCertificateKeyFile "${SITES}/example.ministruts.com/etc/httpd/templates/ssl/example.ministruts.com.key"
+    SSLCertificateFile    "${SITES}/example.ministruts.com/etc/httpd/ssl/example.ministruts.com.crt"
+    SSLCertificateKeyFile "${SITES}/example.ministruts.com/etc/httpd/ssl/example.ministruts.com.key"
 </VirtualHost>
 </IfModule>
diff --git a/etc/httpd/templates/apache22-php-module.conf → etc/httpd/apache22-php-module.conf b/etc/httpd/templates/apache22-php-module.conf → etc/httpd/apache22-php-module.conf
@@ -19,11 +19,11 @@
         Deny from all
     </Directory>
     <Directory "${SITES}/example.ministruts.com/web">
-        # (1) public access, .htaccess disabled or...
+        # public access, .htaccess disabled or...
         Order allow,deny
         Allow from all
 
-        # (2) ...restricted access, .htaccess enabled
+        # ...restricted access, .htaccess enabled
         Order deny,allow
         Deny  from all
         Allow from 127.0.0.1
@@ -62,11 +62,11 @@
         Deny from all
     </Directory>
     <Directory "${SITES}/example.ministruts.com/web">
-        # (1) public access, .htaccess disabled or...
+        # public access, .htaccess disabled or...
         Order allow,deny
         Allow from all
 
-        # (2) ...restricted access, .htaccess enabled
+        # ...restricted access, .htaccess enabled
         Order deny,allow
         Deny  from all
         Allow from 127.0.0.1
@@ -84,7 +84,7 @@
     SSLEngine             on
     SSLProtocol           all -SSLv2
     SSLCipherSuite        HIGH:MEDIUM
-    SSLCertificateFile    "${SITES}/example.ministruts.com/etc/httpd/templates/ssl/example.ministruts.com.crt"
-    SSLCertificateKeyFile "${SITES}/example.ministruts.com/etc/httpd/templates/ssl/example.ministruts.com.key"
+    SSLCertificateFile    "${SITES}/example.ministruts.com/etc/httpd/ssl/example.ministruts.com.crt"
+    SSLCertificateKeyFile "${SITES}/example.ministruts.com/etc/httpd/ssl/example.ministruts.com.key"
 </VirtualHost>
 </IfModule>
diff --git a/etc/httpd/templates/apache24-php-fcgi.conf → etc/httpd/apache24-php-fcgi.conf b/etc/httpd/templates/apache24-php-fcgi.conf → etc/httpd/apache24-php-fcgi.conf
@@ -18,10 +18,10 @@
         Require all denied
     </Directory>
     <Directory "${SITES}/example.ministruts.com/web">
-        # (1) public access, .htaccess disabled or...
+        # public access, .htaccess disabled or...
         Require all granted
 
-        # (2) ...restricted access, .htaccess enabled
+        # ...restricted access, .htaccess enabled
         AllowOverride All
         Require local
     </Directory>
@@ -42,7 +42,7 @@
     <Files "*.php">
         Options      +ExecCGI
         SetHandler   fcgid-script
-        FcgidWrapper "${SITES}/example.ministruts.com/etc/httpd/templates/cgi-bin/php56-wrapper" .php
+        FcgidWrapper "${SITES}/example.ministruts.com/etc/httpd/cgi-bin/php56-wrapper" .php
     </Files>
     <IfModule mod_suexec.c>
         # With mod_suexec FcgidWrapper must point to a permitted executable (see suexec -V).
@@ -72,10 +72,10 @@
         Require all denied
     </Directory>
     <Directory "${SITES}/example.ministruts.com/web">
-        # (1) public access, .htaccess disabled or...
+        # public access, .htaccess disabled or...
         Require all granted
 
-        # (2) ...restricted access, .htaccess enabled
+        # ...restricted access, .htaccess enabled
         AllowOverride All
         Require local
     </Directory>
@@ -96,7 +96,7 @@
     <Files "*.php">
         Options      +ExecCGI
         SetHandler   fcgid-script
-        FcgidWrapper "${SITES}/example.ministruts.com/etc/httpd/templates/cgi-bin/php56-wrapper" .php
+        FcgidWrapper "${SITES}/example.ministruts.com/etc/httpd/cgi-bin/php56-wrapper" .php
     </Files>
     <IfModule mod_suexec.c>
         # With mod_suexec FcgidWrapper must point to a permitted executable (see suexec -V).
@@ -106,7 +106,7 @@
     SSLEngine             on
     SSLProtocol           all -SSLv2
     SSLCipherSuite        HIGH:MEDIUM
-    SSLCertificateFile    "${SITES}/example.ministruts.com/etc/httpd/templates/ssl/example.ministruts.com.crt"
-    SSLCertificateKeyFile "${SITES}/example.ministruts.com/etc/httpd/templates/ssl/example.ministruts.com.key"
+    SSLCertificateFile    "${SITES}/example.ministruts.com/etc/httpd/ssl/example.ministruts.com.crt"
+    SSLCertificateKeyFile "${SITES}/example.ministruts.com/etc/httpd/ssl/example.ministruts.com.key"
 </VirtualHost>
 </IfModule>
diff --git a/etc/httpd/templates/apache24-php-module.conf → etc/httpd/apache24-php-module.conf b/etc/httpd/templates/apache24-php-module.conf → etc/httpd/apache24-php-module.conf
@@ -18,10 +18,10 @@
         Require all denied
     </Directory>
     <Directory "${SITES}/example.ministruts.com/web">
-        # (1) public access, .htaccess disabled or...
+        # public access, .htaccess disabled or...
         Require all granted
 
-        # (2) ...restricted access, .htaccess enabled
+        # ...restricted access, .htaccess enabled
         AllowOverride All
         Require local
     </Directory>
@@ -56,10 +56,10 @@
         Require all denied
     </Directory>
     <Directory "${SITES}/example.ministruts.com/web">
-        # (1) public access, .htaccess disabled or...
+        # public access, .htaccess disabled or...
         Require all granted
 
-        # (2) ...restricted access, .htaccess enabled
+        # ...restricted access, .htaccess enabled
         AllowOverride All
         Require local
     </Directory>
@@ -74,7 +74,7 @@
     SSLEngine             on
     SSLProtocol           all -SSLv2
     SSLCipherSuite        HIGH:MEDIUM
-    SSLCertificateFile    "${SITES}/example.ministruts.com/etc/httpd/templates/ssl/example.ministruts.com.crt"
-    SSLCertificateKeyFile "${SITES}/example.ministruts.com/etc/httpd/templates/ssl/example.ministruts.com.key"
+    SSLCertificateFile    "${SITES}/example.ministruts.com/etc/httpd/ssl/example.ministruts.com.crt"
+    SSLCertificateKeyFile "${SITES}/example.ministruts.com/etc/httpd/ssl/example.ministruts.com.key"
 </VirtualHost>
 </IfModule>
diff --git a/etc/httpd/templates/cgi-bin/php56-wrapper → etc/httpd/cgi-bin/php56-wrapper b/etc/httpd/templates/cgi-bin/php56-wrapper → etc/httpd/cgi-bin/php56-wrapper
diff --git a/...templates/ssl/self-signed/self-signed.crt → etc/httpd/ssl/self-signed.crt b/...templates/ssl/self-signed/self-signed.crt → etc/httpd/ssl/self-signed.crt
diff --git a/...templates/ssl/self-signed/self-signed.key → etc/httpd/ssl/self-signed.key b/...templates/ssl/self-signed/self-signed.key → etc/httpd/ssl/self-signed.key
diff --git a/etc/httpd/templates/cgi-bin/.gitignore b/etc/httpd/templates/cgi-bin/.gitignore
diff --git a/etc/httpd/templates/ssl/.gitignore b/etc/httpd/templates/ssl/.gitignore
diff --git a/etc/js/rosasurfer.js b/etc/js/rosasurfer.js
@@ -2,7 +2,7 @@
 
 
 /**
- * Polyfills and objects extensions.
+ * Polyfills
  */
 if (!Array.from) { Array.from = (function() {
     var toStr = Object.prototype.toString;
@@ -160,7 +160,7 @@ var rosasurfer = {
      *
      * @param  string url [optional] - URL to get query parameters from (default: the current page location)
      *
-     * @return array - {key1: value1, key2: value2, ..., keyN: valueN}
+     * @return object - {key1: value1, key2: value2, ..., keyN: valueN}
      */
     getQueryParameters: function getQueryParameters(url) {
         var pos, query;
@@ -285,16 +285,29 @@ var rosasurfer = {
             else if (arg.constructor) type = arg.constructor.name || arg.constructor.toString();
             else                      type = ''+ arg;
 
-            if (type.startsWith('[object ')) {              // [object HTMLAnchorElement]
+            if (type.startsWith('[object ')) {                      // [object HTMLAnchorElement]
                 type = type.slice(8, -1);
             }
-            else if (type.startsWith('function ')) {        // function HTMLAnchorElement() { [native code] }
-                type = type.slice(9, type.indexOf('('));
+            else if (type.startsWith('function')) {                 // function HTMLAnchorElement() { [native code] }
+                var name = type.slice(8, type.indexOf('(')).trim(); // function( param1, param2... ) { <custom code> }
+                type = name.length ? name : 'function';
             }
         }
         return type;
     },
 
+
+    /**
+     * Whether a variable is defined.
+     *
+     * @param  mixed arg
+     *
+     * @return bool
+     */
+    isDefined: function isDefined(arg) {
+        return (typeof(arg) != 'undefined');
+    },
+
 
     /**
      * A JavaScript implementation of the RSA Data Security, Inc. MD5 Message Digest Algorithm, as defined in RFC 1321.

diff --git a/etc/phpstan/config.neon b/etc/phpstan/config.neon
@@ -10,7 +10,7 @@
 
 parameters:
     autoload_files:
-        - etc/phpstan/api-stubs.php                                 # stubs for PHP extensions and procedural code
+        - etc/phpstan/stubs.php                                     # stubs for PHP extensions and procedural code
 
     excludes_analyse:
         - doc/

diff --git a/etc/phpstan/api-stubs.php → etc/phpstan/stubs.php b/etc/phpstan/api-stubs.php → etc/phpstan/stubs.php
diff --git a/doc/OR Mapping Syntax.md → src/db/orm/OR Mapping Syntax.md b/doc/OR Mapping Syntax.md → src/db/orm/OR Mapping Syntax.md