CI4 changes

- Corrected capitalization of App in use statements
- Added use statements where missing in Events.php

app/Config/Events.php

@@ -2,7 +2,9 @@
 
 namespace Config;
 
+use App\Events\Db_log;
 use App\Events\Load_config;
+use App\Events\Method;
 use CodeIgniter\Events\Events;
 use CodeIgniter\Exceptions\FrameworkException;
 
@@ -53,9 +55,9 @@ Events::on('pre_system', function ()
 	}
 });
 
-$config = new Load_config();	//TODO: Not 100% sure this is the best way to do this, but without instantiating the class, the event engine tries to run the function as if it were static.
+$config = new Load_config();
 Events::on('post_controller_constructor', [$config, 'load_config']);
 
-Events::on('post_controller', ['\App\Events\Db_log', 'db_log_queries']);
+Events::on('post_controller', [Db_log::class, 'db_log_queries']);
 
-Events::on('pre_controller', ['\App\Events\Method', 'validate_method']);
+Events::on('pre_controller', [Method::class, 'validate_method']);

app/Config/Validation.php

@@ -6,7 +6,7 @@ use CodeIgniter\Validation\CreditCardRules;
 use CodeIgniter\Validation\FileRules;
 use CodeIgniter\Validation\FormatRules;
 use CodeIgniter\Validation\Rules;
-use app\Libraries\MY_Validation;
+use App\Libraries\MY_Validation;
 
 class Validation
 {

app/Controllers/Attributes.php

@@ -2,7 +2,7 @@
 
 namespace App\Controllers;
 
-use app\Models\Attribute;
+use App\Models\Attribute;
 
 require_once('Secure_Controller.php');
 

app/Controllers/Cashups.php

@@ -2,9 +2,9 @@
 
 namespace App\Controllers;
 
-use app\Models\Cashup;
-use app\Models\Expense;
-use app\Models\Reports\Summary_payments;
+use App\Models\Cashup;
+use App\Models\Expense;
+use App\Models\Reports\Summary_payments;
 
 /**
  * @property cashup cashup

app/Controllers/Config.php

@@ -2,20 +2,20 @@
 
 namespace App\Controllers;
 
-use app\Libraries\Barcode_lib;
-use app\Libraries\Mailchimp_lib;
-use app\Libraries\Receiving_lib;
-use app\Libraries\Sale_lib;
-use app\Libraries\Tax_lib;
+use App\Libraries\Barcode_lib;
+use App\Libraries\Mailchimp_lib;
+use App\Libraries\Receiving_lib;
+use App\Libraries\Sale_lib;
+use App\Libraries\Tax_lib;
 
-use app\Models\Appconfig;
-use app\Models\Attribute;
-use app\Models\Customer_rewards;
-use app\Models\Dinner_table;
-use app\Models\Module;
-use app\Models\Enums\Rounding_mode;
-use app\Models\Stock_location;
-use app\Models\Tax;
+use App\Models\Appconfig;
+use App\Models\Attribute;
+use App\Models\Customer_rewards;
+use App\Models\Dinner_table;
+use App\Models\Module;
+use App\Models\Enums\Rounding_mode;
+use App\Models\Stock_location;
+use App\Models\Tax;
 
 use CodeIgniter\Encryption\Encryption;
 use CodeIgniter\Encryption\EncrypterInterface;

app/Controllers/Customers.php

@@ -2,11 +2,11 @@
 
 namespace App\Controllers;
 
-use app\Libraries\Mailchimp_lib;
+use App\Libraries\Mailchimp_lib;
 
-use app\Models\Customer;
-use app\Models\Customer_rewards;
-use app\Models\Tax_code;
+use App\Models\Customer;
+use App\Models\Customer_rewards;
+use App\Models\Tax_code;
 
 use CodeIgniter\Encryption\Encryption;
 use CodeIgniter\Encryption\EncrypterInterface;

app/Controllers/Employees.php

@@ -2,7 +2,7 @@
 
 namespace App\Controllers;
 
-use app\Models\Module;
+use App\Models\Module;
 
 /**
  *

app/Controllers/Expenses.php

@@ -2,8 +2,8 @@
 
 namespace App\Controllers;
 
-use app\Models\Expense;
-use app\Models\Expense_category;
+use App\Models\Expense;
+use App\Models\Expense_category;
 
 /**
  * @property expense expense

app/Controllers/Expenses_categories.php

@@ -2,7 +2,7 @@
 
 namespace App\Controllers;
 
-use app\Models\Expense_category;
+use App\Models\Expense_category;
 
 /**
  * @property expense_category expense_category

app/Controllers/Giftcards.php

@@ -2,7 +2,7 @@
 
 namespace App\Controllers;
 
-use app\Models\Giftcard;
+use App\Models\Giftcard;
 
 /**
  * @property giftcard giftcard

app/Controllers/Item_kits.php

@@ -2,11 +2,11 @@
 
 namespace App\Controllers;
 
-use app\Libraries\Barcode_lib;
+use App\Libraries\Barcode_lib;
 
-use app\Models\Item;
-use app\Models\Item_kit;
-use app\Models\Item_kit_items;
+use App\Models\Item;
+use App\Models\Item_kit;
+use App\Models\Item_kit_items;
 
 /**
  *

app/Controllers/Items.php

@@ -2,18 +2,18 @@
 
 namespace App\Controllers;
 
-use app\Libraries\Barcode_lib;
-use app\Libraries\Item_lib;
+use App\Libraries\Barcode_lib;
+use App\Libraries\Item_lib;
 
-use app\Models\Attribute;
-use app\Models\Inventory;
-use app\Models\Item;
-use app\Models\Item_kit;
-use app\Models\Item_quantity;
-use app\Models\Item_taxes;
-use app\Models\Stock_location;
-use app\Models\Supplier;
-use app\Models\Tax_category;
+use App\Models\Attribute;
+use App\Models\Inventory;
+use App\Models\Item;
+use App\Models\Item_kit;
+use App\Models\Item_quantity;
+use App\Models\Item_taxes;
+use App\Models\Stock_location;
+use App\Models\Supplier;
+use App\Models\Tax_category;
 
 use Config\Services;
 use CodeIgniter\Files\File;

app/Controllers/Messages.php

@@ -2,9 +2,9 @@
 
 namespace App\Controllers;
 
-use app\Libraries\Sms_lib;
+use App\Libraries\Sms_lib;
 
-use app\Models\Person;
+use App\Models\Person;
 
 /**
  *

app/Controllers/No_access.php

@@ -2,7 +2,7 @@
 
 namespace App\Controllers;
 
-use app\Models\Module;
+use App\Models\Module;
 
 /**
  * Part of the grants mechanism to restrict access to modules that the user doesn't have permission for.

app/Controllers/Office.php

@@ -2,7 +2,7 @@
 
 namespace App\Controllers;
 
-use app\Models\Employee;
+use App\Models\Employee;
 
 /**
  * @property employee employee

app/Controllers/Persons.php

@@ -2,7 +2,7 @@
 
 namespace App\Controllers;
 
-use app\Models\Person;
+use App\Models\Person;
 
 /**
  * @property person person

app/Controllers/Receivings.php

@@ -2,15 +2,15 @@
 
 namespace App\Controllers;
 
-use app\Libraries\Receiving_lib;
-use app\Libraries\Token_lib;
-use app\Libraries\Barcode_lib;
-use app\Models\Inventory;
-use app\Models\Item;
-use app\Models\Item_kit;
-use app\Models\Receiving;
-use app\Models\Stock_location;
-use app\Models\Supplier;
+use App\Libraries\Receiving_lib;
+use App\Libraries\Token_lib;
+use App\Libraries\Barcode_lib;
+use App\Models\Inventory;
+use App\Models\Item;
+use App\Models\Item_kit;
+use App\Models\Receiving;
+use App\Models\Stock_location;
+use App\Models\Supplier;
 use ReflectionException;
 
 /**

app/Controllers/Reports.php

@@ -2,29 +2,29 @@
 
 namespace App\Controllers;
 
-use app\Models\Attribute;
-use app\Models\Customer;
-use app\Models\Stock_location;
-use app\Models\Supplier;
-use app\Models\Reports\Detailed_receivings;
-use app\Models\Reports\Detailed_sales;
-use app\Models\Reports\Inventory_low;
-use app\Models\Reports\Inventory_summary;
-use app\Models\Reports\Specific_customer;
-use app\Models\Reports\Specific_discount;
-use app\Models\Reports\Specific_employee;
-use app\Models\Reports\Specific_supplier;
-use app\Models\Reports\Summary_categories;
-use app\Models\Reports\Summary_customers;
-use app\Models\Reports\Summary_discounts;
-use app\Models\Reports\Summary_employees;
-use app\Models\Reports\Summary_expenses_categories;
-use app\Models\Reports\Summary_items;
-use app\Models\Reports\Summary_payments;
-use app\Models\Reports\Summary_sales;
-use app\Models\Reports\Summary_sales_taxes;
-use app\Models\Reports\Summary_suppliers;
-use app\Models\Reports\Summary_taxes;
+use App\Models\Attribute;
+use App\Models\Customer;
+use App\Models\Stock_location;
+use App\Models\Supplier;
+use App\Models\Reports\Detailed_receivings;
+use App\Models\Reports\Detailed_sales;
+use App\Models\Reports\Inventory_low;
+use App\Models\Reports\Inventory_summary;
+use App\Models\Reports\Specific_customer;
+use App\Models\Reports\Specific_discount;
+use App\Models\Reports\Specific_employee;
+use App\Models\Reports\Specific_supplier;
+use App\Models\Reports\Summary_categories;
+use App\Models\Reports\Summary_customers;
+use App\Models\Reports\Summary_discounts;
+use App\Models\Reports\Summary_employees;
+use App\Models\Reports\Summary_expenses_categories;
+use App\Models\Reports\Summary_items;
+use App\Models\Reports\Summary_payments;
+use App\Models\Reports\Summary_sales;
+use App\Models\Reports\Summary_sales_taxes;
+use App\Models\Reports\Summary_suppliers;
+use App\Models\Reports\Summary_taxes;
 use CodeIgniter\HTTP\Uri;
 
 /**

app/Controllers/Sales.php

@@ -2,24 +2,24 @@
 
 namespace App\Controllers;
 
-use app\Libraries\Barcode_lib;
-use app\Libraries\Email_lib;
-use app\Libraries\Sale_lib;
-use app\Libraries\Tax_lib;
-use app\Libraries\Token_lib;
-use app\Models\Customer;
-use app\Models\Customer_rewards;
-use app\Models\Dinner_table;
-use app\Models\Employee;
-use app\Models\Giftcard;
-use app\Models\Inventory;
-use app\Models\Item;
-use app\Models\Item_kit;
-use app\Models\Sale;
-use app\Models\Stock_location;
-use app\Models\Tokens\Token_invoice_count;
-use app\Models\Tokens\Token_customer;
-use app\Models\Tokens\Token_invoice_sequence;
+use App\Libraries\Barcode_lib;
+use App\Libraries\Email_lib;
+use App\Libraries\Sale_lib;
+use App\Libraries\Tax_lib;
+use App\Libraries\Token_lib;
+use App\Models\Customer;
+use App\Models\Customer_rewards;
+use App\Models\Dinner_table;
+use App\Models\Employee;
+use App\Models\Giftcard;
+use App\Models\Inventory;
+use App\Models\Item;
+use App\Models\Item_kit;
+use App\Models\Sale;
+use App\Models\Stock_location;
+use App\Models\Tokens\Token_invoice_count;
+use App\Models\Tokens\Token_customer;
+use App\Models\Tokens\Token_invoice_sequence;
 use CodeIgniter\Config\Services;
 use ReflectionException;
 

app/Controllers/Secure_Controller.php

@@ -2,8 +2,8 @@
 
 namespace App\Controllers;
 
-use app\Models\Employee;
-use app\Models\Module;
+use App\Models\Employee;
+use App\Models\Module;
 
 use CodeIgniter\Session\Session;
 

app/Controllers/Suppliers.php

@@ -2,7 +2,7 @@
 
 namespace App\Controllers;
 
-use app\Models\Supplier;
+use App\Models\Supplier;
 
 /**
  *

app/Controllers/Tax_categories.php

@@ -2,7 +2,7 @@
 
 namespace App\Controllers;
 
-use app\Models\Tax_category;
+use App\Models\Tax_category;
 
 /**
  * @property tax_category tax_category

app/Controllers/Tax_codes.php

@@ -2,7 +2,7 @@
 
 namespace App\Controllers;
 
-use app\Models\Tax_code;
+use App\Models\Tax_code;
 
 /**
  * @property tax_code tax_code

app/Controllers/Tax_jurisdictions.php

@@ -2,7 +2,7 @@
 
 namespace App\Controllers;
 
-use app\Models\Tax_jurisdiction;
+use App\Models\Tax_jurisdiction;
 
 /**
  * @property tax_jurisdiction tax_jurisdiction

app/Controllers/Taxes.php

@@ -2,12 +2,12 @@
 
 namespace App\Controllers;
 
-use app\Libraries\Tax_lib;
-use app\Models\enums\Rounding_mode;
-use app\Models\Tax;
-use app\Models\Tax_category;
-use app\Models\Tax_code;
-use app\Models\Tax_jurisdiction;
+use App\Libraries\Tax_lib;
+use App\Models\enums\Rounding_mode;
+use App\Models\Tax;
+use App\Models\Tax_category;
+use App\Models\Tax_code;
+use App\Models\Tax_jurisdiction;
 
 /**
  * @property tax_lib tax_lib

app/Database/Migrations/20170502221506_sales_tax_data.php

@@ -2,8 +2,8 @@
 
 namespace App\Database\Migrations;
 
-use app\Libraries\Tax_lib;
-use app\Models\Appconfig;
+use App\Libraries\Tax_lib;
+use App\Models\Appconfig;
 use CodeIgniter\Database\Migration;
 use CodeIgniter\Database\ResultInterface;
 

app/Database/Migrations/20200202000000_taxamount.php

@@ -3,8 +3,8 @@
 namespace App\Database\Migrations;
 
 use CodeIgniter\Database\Migration;
-use app\Libraries\Tax_lib;
-use app\Models\Appconfig;
+use App\Libraries\Tax_lib;
+use App\Models\Appconfig;
 use CodeIgniter\Database\ResultInterface;
 
 /**

app/Database/Migrations/20210422000000_database_optimizations.php

@@ -4,7 +4,7 @@ namespace App\Database\Migrations;
 
 use CodeIgniter\Database\Migration;
 use CodeIgniter\Database\ResultInterface;
-use app\Models\Attribute;
+use App\Models\Attribute;
 use DateTime;
 
 class Migration_database_optimizations extends Migration

app/Database/Migrations/20210422000001_remove_duplicate_links.php

@@ -3,7 +3,7 @@
 namespace App\Database\Migrations;
 
 use CodeIgniter\Database\Migration;
-use app\Models\Attribute;
+use App\Models\Attribute;
 
 class Migration_remove_duplicate_links extends Migration
 {

app/Events/Load_config.php

@@ -2,8 +2,8 @@
 
 namespace App\Events;
 
-use app\Libraries\MY_Migration;
-use app\Models\Appconfig;
+use App\Libraries\MY_Migration;
+use App\Models\Appconfig;
 use CodeIgniter\Session\Session;
 use Config\Services;
 

app/Helpers/locale_helper.php

@@ -1,5 +1,5 @@
 <?php
-use app\Models\Employee;
+use App\Models\Employee;
 
 const DEFAULT_LANGUAGE = 'english';	//TODO: These constants all need to be moved to constants.php
 const DEFAULT_LANGUAGE_CODE = 'en-US';

app/Helpers/report_helper.php

@@ -1,6 +1,6 @@
 <?php
 
-use app\Models\Employee;
+use App\Models\Employee;
 
 /**
  * Report helper

app/Helpers/tabular_helper.php

@@ -1,9 +1,9 @@
 <?php
 
-use app\Models\Attribute;
-use app\Models\Employee;
-use app\Models\Item_taxes;
-use app\Models\Tax_category;
+use App\Models\Attribute;
+use App\Models\Employee;
+use App\Models\Item_taxes;
+use App\Models\Tax_category;
 use CodeIgniter\Database\ResultInterface;
 use CodeIgniter\Session\Session;
 

app/Helpers/tax_helper.php

@@ -1,6 +1,6 @@
 <?php
 
-use app\Models\Enums\Rounding_mode;
+use App\Models\Enums\Rounding_mode;
 
 /**
  * Tax Configuration tabular helpers

app/Libraries/Item_lib.php

@@ -3,7 +3,7 @@
 namespace app\Libraries;
 
 use CodeIgniter\Session\Session;
-use app\Models\Stock_location;
+use App\Models\Stock_location;
 
 /**
  * Item library

app/Libraries/MY_Migration.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace app\Libraries;
+namespace App\Libraries;
 
 use CodeIgniter\Database\MigrationRunner;
 

app/Libraries/MY_Validation.php

@@ -5,7 +5,7 @@ namespace app\Libraries;
 use CodeIgniter\Database\Migration;
 use CodeIgniter\Validation\Validation;
 use Config\Services;
-use app\Models\Employee;
+use App\Models\Employee;
 
 /**
  * @property migration migration

app/Libraries/Sale_lib.php

@@ -2,17 +2,17 @@
 
 namespace app\Libraries;
 
-use app\Models\Attribute;
-use app\Models\Customer;
-use app\Models\Dinner_table;
-use app\Models\Item;
-use app\Models\Item_kit_items;
-use app\Models\Item_quantity;
-use app\Models\Item_taxes;
-use app\Models\Enums\Rounding_mode;
-use app\Models\Sale;
+use App\Models\Attribute;
+use App\Models\Customer;
+use App\Models\Dinner_table;
+use App\Models\Item;
+use App\Models\Item_kit_items;
+use App\Models\Item_quantity;
+use App\Models\Item_taxes;
+use App\Models\Enums\Rounding_mode;
+use App\Models\Sale;
 use CodeIgniter\Session\Session;
-use app\Models\Stock_location;
+use App\Models\Stock_location;
 use ReflectionException;
 
 /**

app/Libraries/Tax_lib.php

@@ -2,14 +2,14 @@
 
 namespace app\Libraries;
 
-use app\Models\Customer;
-use app\Models\Item_taxes;
-use app\Models\Enums\Rounding_mode;
-use app\Models\Sale;
-use app\Models\Tax;
-use app\Models\Tax_category;
-use app\Models\Tax_code;
-use app\Models\Tax_jurisdiction;
+use App\Models\Customer;
+use App\Models\Item_taxes;
+use App\Models\Enums\Rounding_mode;
+use App\Models\Sale;
+use App\Models\Tax;
+use App\Models\Tax_category;
+use App\Models\Tax_code;
+use App\Models\Tax_jurisdiction;
 
 
 /**

app/Libraries/Token_lib.php

@@ -2,7 +2,7 @@
 
 namespace app\Libraries;
 
-use app\Models\tokens\Token;
+use App\Models\tokens\Token;
 
 /**
  * Token library

app/Models/Reports/Detailed_receivings.php

@@ -2,7 +2,7 @@
 
 namespace App\Models\Reports;
 
-use app\Models\Receiving;
+use App\Models\Receiving;
 
 /**
  * 

app/Models/Reports/Detailed_sales.php

@@ -2,7 +2,7 @@
 
 namespace App\Models\Reports;
 
-use app\Models\Sale;
+use App\Models\Sale;
 
 /**
  *

app/Models/Reports/Inventory_low.php

@@ -2,7 +2,7 @@
 
 namespace App\Models\Reports;
 
-use app\Models\Item;
+use App\Models\Item;
 
 /**
  *

app/Models/Reports/Inventory_summary.php

@@ -2,7 +2,7 @@
 
 namespace App\Models\Reports;
 
-use app\Models\Item;
+use App\Models\Item;
 
 /**
  *

app/Models/Reports/Specific_customer.php

@@ -2,7 +2,7 @@
 
 namespace App\Models\Reports;
 
-use app\Models\Sale;
+use App\Models\Sale;
 
 /**
  *

app/Models/Reports/Specific_discount.php

@@ -2,7 +2,7 @@
 
 namespace App\Models\Reports;
 
-use app\Models\Sale;
+use App\Models\Sale;
 
 /**
  *

app/Models/Reports/Specific_employee.php

@@ -2,7 +2,7 @@
 
 namespace App\Models\Reports;
 
-use app\Models\Sale;
+use App\Models\Sale;
 
 /**
  *

app/Models/Reports/Specific_supplier.php

@@ -2,7 +2,7 @@
 
 namespace App\Models\Reports;
 
-use app\Models\Sale;
+use App\Models\Sale;
 
 /**
  *

app/Models/Sale.php

@@ -4,7 +4,7 @@ namespace App\Models;
 
 use CodeIgniter\Database\ResultInterface;
 use CodeIgniter\Model;
-use app\Libraries\Sale_lib;
+use App\Libraries\Sale_lib;
 use ReflectionException;
 
 /**

app/Models/Tokens/Token_customer.php

@@ -2,9 +2,9 @@
 
 namespace App\Models\Tokens;
 
-use app\Libraries\Sale_lib;
+use App\Libraries\Sale_lib;
 
-use app\Models\Customer;
+use App\Models\Customer;
 
 /**
  * Token_customer class

app/Models/Tokens/Token_invoice_count.php

@@ -2,7 +2,7 @@
 
 namespace App\Models\Tokens;
 
-use app\Models\Sale;
+use App\Models\Sale;
 
 /**
  * Token_invoice_count class

app/Models/Tokens/Token_invoice_sequence.php

@@ -2,7 +2,7 @@
 
 namespace App\Models\Tokens;
 
-use app\Models\Appconfig;
+use App\Models\Appconfig;
 use ReflectionException;
 
 /**

app/Models/Tokens/Token_quote_sequence.php

@@ -2,7 +2,7 @@
 
 namespace App\Models\Tokens;
 
-use app\Models\Appconfig;
+use App\Models\Appconfig;
 use ReflectionException;
 
 /**

app/Models/Tokens/Token_suspended_invoice_count.php

@@ -2,7 +2,7 @@
 
 namespace App\Models\Tokens;
 
-use app\Models\Sale;
+use App\Models\Sale;
 
 /**
  * Token_suspended_invoice_count class

app/Models/Tokens/Token_work_order_sequence.php

@@ -2,7 +2,7 @@
 
 namespace App\Models\Tokens;
 
-use app\Models\Appconfig;
+use App\Models\Appconfig;
 use ReflectionException;
 
 /**

app/Models/Tokens/Token_year_invoice_count.php

@@ -2,7 +2,7 @@
 
 namespace App\Models\Tokens;
 
-use app\Models\Sale;
+use App\Models\Sale;
 
 /**
  * Token_year_invoice_count class

app/Models/Tokens/Token_year_quote_count.php

@@ -2,7 +2,7 @@
 
 namespace App\Models\Tokens;
 
-use app\Models\Sale;
+use App\Models\Sale;
 
 /**
  * Token_year_quote_count class

app/Views/items/form_count_details.php

@@ -5,7 +5,7 @@
  * @var array $item_quantities
  */
 
-use app\Models\Employee;
+use App\Models\Employee;
 
 ?>
 <?php echo form_open('items', ['id' => 'item_form', 'class' => 'form-horizontal']) ?>

app/Views/items/manage.php

@@ -7,7 +7,7 @@
  * @var int $stock_location
  */
 
-use app\Models\Employee;
+use App\Models\Employee;
 
 ?>
 <?php echo view('partial/header') ?>

app/Views/reports/listing.php

@@ -3,7 +3,7 @@
  * @var array $grants
  */
 
-use app\Models\Employee;
+use App\Models\Employee;
 
 ?>
 <?php echo view('partial/header') ?>

app/Views/sales/receipt.php

@@ -4,7 +4,7 @@
  * @var bool $print_after_sale
  */
 
-use app\Models\Employee;
+use App\Models\Employee;
 
 ?>
 <?php echo view('partial/header') ?>

app/Views/sales/register.php

@@ -38,7 +38,7 @@
  * @var float $cash_amount_due
  */
 
-use app\Models\Employee;
+use App\Models\Employee;
 
 ?>
 <?php echo view('partial/header') ?>

app/Views/sales/suspended.php

@@ -3,8 +3,8 @@
  * @var array $suspended_sales
  */
 
-use app\Models\Employee;
-use app\Models\Customer;
+use App\Models\Employee;
+use App\Models\Customer;
 
 ?>
 <style>

tests/libraries/TokenLibTest.php

@@ -1,8 +1,8 @@
 <?php
 namespace App\Libraries;
 
-use app\Models\Appconfig;
-use app\Libraries\Token_lib;
+use App\Models\Appconfig;
+use App\Libraries\Token_lib;
 use App\Models\Tokens\Token;
 use CodeIgniter\Test\CIUnitTestCase;