From ab2685ef62682774b3b07b4bbdd1417bbbde86be Mon Sep 17 00:00:00 2001 From: FrancescoUK Date: Fri, 22 Dec 2017 20:58:18 +0000 Subject: [PATCH] Fix circular lib dependency (#1668) upgrade to CI 3.1.6 --- application/controllers/Sales.php | 1 - application/libraries/Tax_lib.php | 1 - .../20170502221506_sales_tax_data.php | 1 - application/views/partial/header.php | 2 +- composer.json | 4 ++-- composer.lock | 24 +++++++++---------- public/license/composer.LICENSES | 6 ++--- 7 files changed, 18 insertions(+), 21 deletions(-) diff --git a/application/controllers/Sales.php b/application/controllers/Sales.php index a22f20133..b0a44c2b6 100644 --- a/application/controllers/Sales.php +++ b/application/controllers/Sales.php @@ -12,7 +12,6 @@ class Sales extends Secure_Controller parent::__construct('sales'); $this->load->library('sale_lib'); - $this->load->library('tax_lib'); $this->load->library('barcode_lib'); $this->load->library('email_lib'); $this->load->library('token_lib'); diff --git a/application/libraries/Tax_lib.php b/application/libraries/Tax_lib.php index 8e52b2345..b7fc9b5ab 100644 --- a/application/libraries/Tax_lib.php +++ b/application/libraries/Tax_lib.php @@ -17,7 +17,6 @@ class Tax_lib public function __construct() { $this->CI =& get_instance(); - $this->CI->load->library('sale_lib'); } public function get_tax_types() diff --git a/application/migrations/20170502221506_sales_tax_data.php b/application/migrations/20170502221506_sales_tax_data.php index a3036bc29..921d5c63e 100644 --- a/application/migrations/20170502221506_sales_tax_data.php +++ b/application/migrations/20170502221506_sales_tax_data.php @@ -6,7 +6,6 @@ class Migration_Sales_Tax_Data extends CI_Migration { parent::__construct(); - $this->load->library('tax_lib'); $this->load->library('sale_lib'); } diff --git a/application/views/partial/header.php b/application/views/partial/header.php index ae3bbf43f..f4d580cae 100644 --- a/application/views/partial/header.php +++ b/application/views/partial/header.php @@ -76,7 +76,7 @@ - + diff --git a/composer.json b/composer.json index 18aedaca4..793dec201 100644 --- a/composer.json +++ b/composer.json @@ -18,9 +18,9 @@ "homepage": "https://github.com/opensourcepos/opensourcepos", "require": { "php": "^5.5 || ^7.0", - "codeigniter/framework": "^3.1.2", + "codeigniter/framework": "^3.1", "ins0/google-measurement-php-client": "dev-master#2b3aef2375837339f5b2bfe88e76994481f86264", - "dompdf/dompdf": "^0.7.0", + "dompdf/dompdf": "^0.7", "tamtamchik/namecase": "^1.0", "paragonie/random_compat": "^2.0" }, diff --git a/composer.lock b/composer.lock index 835fa55d3..69f7f60c1 100644 --- a/composer.lock +++ b/composer.lock @@ -4,21 +4,21 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], - "hash": "70caa9e28d94e2435477700cdba628a5", - "content-hash": "2e34a0c173a47d5f39d714465612eff9", + "hash": "14aea6777107125b76e9ba27959c6714", + "content-hash": "3d6b117b193c8f3190ffdc414667fdd1", "packages": [ { "name": "codeigniter/framework", - "version": "3.1.5", + "version": "3.1.6", "source": { "type": "git", "url": "https://github.com/bcit-ci/CodeIgniter.git", - "reference": "6c7a4266410070d30f8f6bcdf9c9e67f3d6478e3" + "reference": "7e4f63cd4b792e7dc2dc4b8b0183a6072a3f9462" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/bcit-ci/CodeIgniter/zipball/6c7a4266410070d30f8f6bcdf9c9e67f3d6478e3", - "reference": "6c7a4266410070d30f8f6bcdf9c9e67f3d6478e3", + "url": "https://api.github.com/repos/bcit-ci/CodeIgniter/zipball/7e4f63cd4b792e7dc2dc4b8b0183a6072a3f9462", + "reference": "7e4f63cd4b792e7dc2dc4b8b0183a6072a3f9462", "shasum": "" }, "require": { @@ -38,7 +38,7 @@ ], "description": "The CodeIgniter framework", "homepage": "https://codeigniter.com", - "time": "2017-06-19 08:33:58" + "time": "2017-09-25 16:43:58" }, { "name": "dompdf/dompdf", @@ -156,16 +156,16 @@ }, { "name": "paragonie/random_compat", - "version": "v2.0.10", + "version": "v2.0.11", "source": { "type": "git", "url": "https://github.com/paragonie/random_compat.git", - "reference": "634bae8e911eefa89c1abfbf1b66da679ac8f54d" + "reference": "5da4d3c796c275c55f057af5a643ae297d96b4d8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/paragonie/random_compat/zipball/634bae8e911eefa89c1abfbf1b66da679ac8f54d", - "reference": "634bae8e911eefa89c1abfbf1b66da679ac8f54d", + "url": "https://api.github.com/repos/paragonie/random_compat/zipball/5da4d3c796c275c55f057af5a643ae297d96b4d8", + "reference": "5da4d3c796c275c55f057af5a643ae297d96b4d8", "shasum": "" }, "require": { @@ -200,7 +200,7 @@ "pseudorandom", "random" ], - "time": "2017-03-13 16:27:32" + "time": "2017-09-27 21:40:39" }, { "name": "phenx/php-font-lib", diff --git a/public/license/composer.LICENSES b/public/license/composer.LICENSES index 11712dc10..6d8cdfb16 100644 --- a/public/license/composer.LICENSES +++ b/public/license/composer.LICENSES @@ -1,12 +1,12 @@ { "name": "OpenSourcePOS", - "version": "3.1.0", + "version": "3.2.0", "license": [ "MIT" ], "dependencies": { "codeigniter/framework": { - "version": "3.1.5", + "version": "3.1.6", "license": [ "MIT" ] @@ -30,7 +30,7 @@ ] }, "paragonie/random_compat": { - "version": "2.0.10", + "version": "2.0.11", "license": [ "MIT" ]