Feature: CodeIgniter 4 upgrade

.bowerrc

@@ -1,7 +1,3 @@
 {
-    "directory": "public/bower_components",
-    "scripts": {
-        "postinstall": "grunt default genlicense",
-        "postuninstall": "grunt default genlicense"
-    }
+    "directory": "public/resources"
 }

.dockerignore

@@ -1,6 +1,6 @@
 node_modules
 tmp
-application/config/email.php
+app/Config/Email.php
 *.patch
 patches/
 .idea/
@@ -16,4 +16,6 @@ git-svn-diff.py
 *~
 *.~
 *.log
-application/sessions/*
+app/writable/session/*
+!app/writable/session/index.html
+

.editorconfig

@@ -0,0 +1,22 @@
+root = true
+
+[*]
+charset = utf-8
+end_of_line = crlf
+indent_size = 4
+indent_style = tab
+insert_final_newline = true
+max_line_length = 120
+tab_width = 4
+
+[{*.cjs,*.js}]
+indent_style = tab
+
+[{*.ctp,*.hphp,*.inc,*.module,*.php,*.php4,*.php5,*.phtml}]
+indent_style = tab
+
+[{*.har,*.jsb2,*.jsb3,*.json,.babelrc,.eslintrc,.prettierrc,.stylelintrc,bowerrc,composer.lock,jest.config}]
+indent_style = tab
+
+[{*.htm,*.html,*.ng,*.sht,*.shtm,*.shtml}]
+indent_style = tab

.env

@@ -0,0 +1,63 @@
+#--------------------------------------------------------------------
+# ENVIRONMENT
+#--------------------------------------------------------------------
+
+CI_ENVIRONMENT = production
+
+#--------------------------------------------------------------------
+# DATABASE
+#--------------------------------------------------------------------
+
+database.default.hostname = 'localhost'
+database.default.database = 'ospos'
+database.default.username = 'admin'
+database.default.password = 'pointofsale'
+database.default.DBDriver = 'MySQLi'
+database.default.DBPrefix = 'ospos_'
+
+database.development.hostname = 'localhost'
+database.development.database = 'ospos'
+database.development.username = 'admin'
+database.development.password = 'pointofsale'
+database.development.DBDriver = 'MySQLi'
+database.development.DBPrefix = 'ospos_'
+
+database.tests.hostname = 'localhost'
+database.tests.database = 'ospos'
+database.tests.username = 'admin'
+database.tests.password = 'pointofsale'
+database.tests.DBDriver = 'MySQLi'
+database.tests.DBPrefix = 'ospos_'
+
+#--------------------------------------------------------------------
+# ENCRYPTION
+#--------------------------------------------------------------------
+
+encryption.key = ''
+
+#--------------------------------------------------------------------
+# LOGGER
+	 # - 0 = Disables logging, Error logging TURNED OFF
+	 # - 1 = Emergency Messages - System is unusable
+	 # - 2 = Alert Messages - Action Must Be Taken Immediately
+	 # - 3 = Critical Messages - Application component unavailable, unexpected exception.
+	 # - 4 = Runtime Errors - Don't need immediate action, but should be monitored.
+	 # - 5 = Warnings - Exceptional occurrences that are not errors.
+	 # - 6 = Notices - Normal but significant events.
+	 # - 7 = Info - Interesting events, like user logging in, etc.
+	 # - 8 = Debug - Detailed debug information.
+	 # - 9 = All Messages
+#--------------------------------------------------------------------
+
+logger.threshold = 0
+app.db_log_enabled = false
+
+#--------------------------------------------------------------------
+# HONEYPOT
+#--------------------------------------------------------------------
+
+honeypot.hidden = true
+honeypot.label = 'Fill This Field'
+honeypot.name = 'honeypot'
+honeypot.template = '<label>{label}</label><input type="text" name="{name}" value=""/>'
+honeypot.container = '<div style="display:none">{template}</div>'

.env-example

@@ -0,0 +1,63 @@
+#--------------------------------------------------------------------
+# ENVIRONMENT
+#--------------------------------------------------------------------
+
+CI_ENVIRONMENT = production
+
+#--------------------------------------------------------------------
+# DATABASE
+#--------------------------------------------------------------------
+
+database.default.hostname = 'localhost'
+database.default.database = 'ospos'
+database.default.username = 'admin'
+database.default.password = 'pointofsale'
+database.default.DBDriver = 'MySQLi'
+database.default.DBPrefix = 'ospos_'
+
+database.development.hostname = 'localhost'
+database.development.database = 'ospos'
+database.development.username = 'admin'
+database.development.password = 'pointofsale'
+database.development.DBDriver = 'MySQLi'
+database.development.DBPrefix = 'ospos_'
+
+database.tests.hostname = 'localhost'
+database.tests.database = 'ospos'
+database.tests.username = 'admin'
+database.tests.password = 'pointofsale'
+database.tests.DBDriver = 'MySQLi'
+database.tests.DBPrefix = 'ospos_'
+
+#--------------------------------------------------------------------
+# ENCRYPTION
+#--------------------------------------------------------------------
+
+encryption.key = ''
+
+#--------------------------------------------------------------------
+# LOGGER
+	 # - 0 = Disables logging, Error logging TURNED OFF
+	 # - 1 = Emergency Messages - System is unusable
+	 # - 2 = Alert Messages - Action Must Be Taken Immediately
+	 # - 3 = Critical Messages - Application component unavailable, unexpected exception.
+	 # - 4 = Runtime Errors - Don't need immediate action, but should be monitored.
+	 # - 5 = Warnings - Exceptional occurrences that are not errors.
+	 # - 6 = Notices - Normal but significant events.
+	 # - 7 = Info - Interesting events, like user logging in, etc.
+	 # - 8 = Debug - Detailed debug information.
+	 # - 9 = All Messages
+#--------------------------------------------------------------------
+
+logger.threshold = 0
+app.db_log_enabled = false
+
+#--------------------------------------------------------------------
+# HONEYPOT
+#--------------------------------------------------------------------
+
+honeypot.hidden = true
+honeypot.label = 'Fill This Field'
+honeypot.name = 'honeypot'
+honeypot.template = '<label>{label}</label><input type="text" name="{name}" value=""/>'
+honeypot.container = '<div style="display:none">{template}</div>'

.gitattributes

@@ -1,3 +1,3 @@
 dist/ merge=ours
-application/language/**/*.php merge=ours
+app/Language/**/*.php merge=ours
 text=auto

.github/workflows/main.yml

@@ -0,0 +1,61 @@
+name: Coding Standards
+
+on:
+  push:
+    paths:
+      - '**.php'
+      - 'spark'
+      - '.github/workflows/test-coding-standards.yml'
+  pull_request:
+    paths:
+      - '**.php'
+      - 'spark'
+      - '.github/workflows/test-coding-standards.yml'
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
+  cancel-in-progress: true
+
+permissions:
+  contents: read
+
+jobs:
+  lint:
+    name: PHP ${{ matrix.php-version }} Lint with PHP CS Fixer
+    runs-on: ubuntu-22.04
+
+    strategy:
+      fail-fast: false
+      matrix:
+        php-version:
+          - '7.4'
+          - '8.0'
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Setup PHP
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: ${{ matrix.php-version }}
+          extensions: tokenizer
+          coverage: none
+
+      - name: Get composer cache directory
+        run: echo "COMPOSER_CACHE_FILES_DIR=$(composer config cache-files-dir)" >> $GITHUB_ENV
+
+      - name: Cache dependencies
+        uses: actions/cache@v3
+        with:
+          path: ${{ env.COMPOSER_CACHE_FILES_DIR }}
+          key: ${{ runner.os }}-${{ matrix.php-version }}-${{ hashFiles('**/composer.lock') }}
+          restore-keys: |
+            ${{ runner.os }}-${{ matrix.php-version }}-
+            ${{ runner.os }}-
+
+      - name: Install dependencies
+        run: composer update --ansi --no-interaction
+
+      - name: Run lint on `app/`, `public/`
+        run: vendor/bin/php-cs-fixer fix --verbose --ansi --dry-run --config=.php-cs-fixer.no-header.php --using-cache=no --diff

.gitignore

@@ -1,33 +1,18 @@
 # Dependency directories
-/node_modules
-/vendor
-/public/bower_components
-
-# Logs
-/application/logs/*
-*.log
+node_modules
+vendor
+public/resources
+app/Config/email.php
+app/sessions/*
+app/logs/*
+app/uploads/*
 npm-debug.log*
 
-# Build generated
-/tmp
-/public/license/.licenses
-/public/license/bower.LICENSES
-/public/dist
-
 # Docker
-!/docker/.env
-/docker/data/database/db/*
-/docker/data/certbot/conf/*
-/docker/data/ospos/app/*
-
-# Database
-/database/database.sql
-/database/migrate_phppos_dist.sql
-
-# Use files
-/application/config/email.php
-/application/sessions/*
-/application/uploads/*
+!docker/.env
+docker/data/database/db/*
+docker/data/certbot/conf/*
+docker/data/ospos/app/*
 
 # Editors
 ## SublimeText
@@ -69,22 +54,28 @@ $RECYCLE.BIN/
 .com.apple.timemachine.donotpresent
 
 # Other
-/generate_langauges.php
-/dist
-/docs
+generate_languages.php
+dist
+docs
 /patches
-/translations
+translations
 /.buildpath
 /.project
 /.settings/*
 *.patch
 git-svn-diff.py
 *.bash
 .swp
+system/
 *.swp
 *.rej
 *.orig
 *~
 *.~
 .env
 auth.json
+
+*.png
+*.jpg
+*.jpeg
+*copy*

.htaccess

@@ -1,9 +1,15 @@
 # redirect to public page
 <IfModule mod_rewrite.c>
-  RewriteEngine On
-  RewriteCond %{REQUEST_URI} !^public$
-  RewriteCond %{REQUEST_URI} !^/.well-known/acme-challenge [NC]
-  RewriteRule "^(.*)$" "/public/" [R=301,L]
+    RewriteEngine On
+
+    RewriteCond %{REQUEST_URI} !^public$
+    RewriteCond %{REQUEST_URI} !^/.well-known/acme-challenge [NC]
+    RewriteRule "^(.*)$" "/public/" [R=301,L]
+
+    # If you installed CodeIgniter in a subfolder, you will need to
+    # change the following line to match the subfolder you need. Uncomment
+    # the line below and comment the line above.
+    #RewriteRule "^(.*)$"  "/[SUBDIRECTORY]/public/" [R=301,L]
 </IfModule>
 
 # disable directory browsing
@@ -17,7 +23,6 @@ IndexIgnore *
   Header always set X-Frame-Options "SAMEORIGIN"
 </Ifmodule>
 
-# Apache 2.4
 <IfModule authz_core_module>
   # secure htaccess file
   <Files .htaccess>
@@ -39,34 +44,3 @@ IndexIgnore *
     Require all denied
   </FilesMatch>
 </IfModule>
-
-# Apache 2.2
-<IfModule !authz_core_module>
-  # secure htaccess file
-  <Files .htaccess>
-    Order allow,deny
-    Deny from all
-    Satisfy all
-  </Files>
-
-  # prevent access to PHP error log
-  <Files error_log>
-    Order allow,deny
-    Deny from all
-    Satisfy all
-  </Files>
-
-  # prevent access to LICENSE
-  <Files LICENSE>
-    Order allow,deny
-    Deny from all
-    Satisfy all
-  </Files>
-
-  # prevent access to csv, txt and md files
-  <FilesMatch "\.(csv|txt|md|yml|json|lock)$">
-    Order allow,deny
-    Deny from all
-    Satisfy all
-  </FilesMatch>
-</IfModule>