From 694d400efb077666955672c2e8c22e4d1b3a3a06 Mon Sep 17 00:00:00 2001 From: James L Parry Date: Wed, 3 Dec 2014 20:53:40 -0800 Subject: Flag the smiley helper and shopping cart as deprecated. They should be removed the next minor release. Lowered the "javascript" deprecation message to "important" instead of "warning", for consistency with the rest of CI. Signed-off-by:James L Parry --- system/libraries/Cart.php | 1 + 1 file changed, 1 insertion(+) (limited to 'system/libraries/Cart.php') diff --git a/system/libraries/Cart.php b/system/libraries/Cart.php index 14f08a8c3..686d563b0 100644 --- a/system/libraries/Cart.php +++ b/system/libraries/Cart.php @@ -45,6 +45,7 @@ defined('BASEPATH') OR exit('No direct script access allowed'); * @category Shopping Cart * @author EllisLab Dev Team * @link http://codeigniter.com/user_guide/libraries/cart.html + * @deprecated 3.0.0 This class does not fit CI */ class CI_Cart { -- cgit v1.2.3-24-g4f1b From 21c3c22320a10d32054b251b24e5b1e569ddeabf Mon Sep 17 00:00:00 2001 From: Andrey Andreev Date: Thu, 4 Dec 2014 12:10:00 +0200 Subject: [ci skip] Update on the changes from PR #3388 - Fixed a broken link - Added missing notes about deprecations in the upgrade instructions - Improved consistency with other deprecation notices in the docs --- system/libraries/Cart.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'system/libraries/Cart.php') diff --git a/system/libraries/Cart.php b/system/libraries/Cart.php index 686d563b0..72ef5e8b5 100644 --- a/system/libraries/Cart.php +++ b/system/libraries/Cart.php @@ -45,7 +45,7 @@ defined('BASEPATH') OR exit('No direct script access allowed'); * @category Shopping Cart * @author EllisLab Dev Team * @link http://codeigniter.com/user_guide/libraries/cart.html - * @deprecated 3.0.0 This class does not fit CI + * @deprecated 3.0.0 This class is too specific for CI. */ class CI_Cart { -- cgit v1.2.3-24-g4f1b From fe9309d22c1b088f5363954d6dac013c8c955894 Mon Sep 17 00:00:00 2001 From: Andrey Andreev Date: Fri, 9 Jan 2015 17:48:58 +0200 Subject: Bulk (mostly documentation) update - Remove PHP version from license notices - Bump year number in copyright notices - Recommend PHP 5.4 or newer to be used - Tell Travis-CI to test on PHP 5.3.0 instead of the latest 5.3 version Related: #3450 --- system/libraries/Cart.php | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'system/libraries/Cart.php') diff --git a/system/libraries/Cart.php b/system/libraries/Cart.php index 72ef5e8b5..a0fe1053d 100644 --- a/system/libraries/Cart.php +++ b/system/libraries/Cart.php @@ -2,11 +2,11 @@ /** * CodeIgniter * - * An open source application development framework for PHP 5.2.4 or newer + * An open source application development framework for PHP * * This content is released under the MIT License (MIT) * - * Copyright (c) 2014, British Columbia Institute of Technology + * Copyright (c) 2014 - 2015, British Columbia Institute of Technology * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -29,7 +29,7 @@ * @package CodeIgniter * @author EllisLab Dev Team * @copyright Copyright (c) 2008 - 2014, EllisLab, Inc. (http://ellislab.com/) - * @copyright Copyright (c) 2014, British Columbia Institute of Technology (http://bcit.ca/) + * @copyright Copyright (c) 2014 - 2015, British Columbia Institute of Technology (http://bcit.ca/) * @license http://opensource.org/licenses/MIT MIT License * @link http://codeigniter.com * @since Version 1.0.0 @@ -55,7 +55,7 @@ class CI_Cart { * * @var string */ - public $product_id_rules = '\.a-z0-9_-'; + public $product_id_rules = '\.a-z0-9_-'; /** * These are the regular expression rules that we use to validate the product ID and product name @@ -63,14 +63,14 @@ class CI_Cart { * * @var string */ - public $product_name_rules = '\w \-\.\:'; + public $product_name_rules = '\w \-\.\:'; /** * only allow safe product names * * @var bool */ - public $product_name_safe = TRUE; + public $product_name_safe = TRUE; // -------------------------------------------------------------------------- @@ -86,7 +86,7 @@ class CI_Cart { * * @var array */ - protected $_cart_contents = array(); + protected $_cart_contents = array(); /** * Shopping Class Constructor -- cgit v1.2.3-24-g4f1b