Skip to content

Commit

Permalink
Merge branch '1.9/develop' into '1.8/master'
Browse files Browse the repository at this point in the history
  • Loading branch information
@WanWizard
WanWizard committed Jun 27, 2019
2 parents 7485119 + 4468520 commit 226855f
Show file tree
Hide file tree
Showing 282 changed files with 545 additions and 545 deletions.
4 changes: 2 additions & 2 deletions base.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
* @version 1.8.1
* @author Fuel Development Team
* @license MIT License
* @copyright 2010 - 2018 Fuel Development Team
* @link http://fuelphp.com
* @copyright 2010 - 2019 Fuel Development Team
* @link https://fuelphp.com
*/

// load PHP 5.6+ specific code
Expand Down
4 changes: 2 additions & 2 deletions base56.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
* @version 1.8.1
* @author Fuel Development Team
* @license MIT License
* @copyright 2010 - 2018 Fuel Development Team
* @link http://fuelphp.com
* @copyright 2010 - 2019 Fuel Development Team
* @link https://fuelphp.com
*/

/**
Expand Down
4 changes: 2 additions & 2 deletions bootstrap.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
* @version 1.8.1
* @author Fuel Development Team
* @license MIT License
* @copyright 2010 - 2018 Fuel Development Team
* @link http://fuelphp.com
* @copyright 2010 - 2019 Fuel Development Team
* @link https://fuelphp.com
*/

define('DS', DIRECTORY_SEPARATOR);
Expand Down
4 changes: 2 additions & 2 deletions bootstrap_phpunit.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
* @version 1.8.1
* @author Fuel Development Team
* @license MIT License
* @copyright 2010 - 2018 Fuel Development Team
* @link http://fuelphp.com
* @copyright 2010 - 2019 Fuel Development Team
* @link https://fuelphp.com
*/

/**
Expand Down
8 changes: 4 additions & 4 deletions classes/agent.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
* @version 1.8.1
* @author Fuel Development Team
* @license MIT License
* @copyright 2010 - 2018 Fuel Development Team
* @link http://fuelphp.com
* @copyright 2010 - 2019 Fuel Development Team
* @link https://fuelphp.com
*/

namespace Fuel\Core;
Expand Down Expand Up @@ -452,7 +452,7 @@ protected static function parse_browscap()
curl_setopt($curl, CURLOPT_MAXREDIRS, 5);
curl_setopt($curl, CURLOPT_RETURNTRANSFER, 1);
curl_setopt($curl, CURLOPT_HEADER, 0);
curl_setopt($curl, CURLOPT_USERAGENT, 'Fuel PHP framework - Agent class (http://fuelphp.com)');
curl_setopt($curl, CURLOPT_USERAGENT, 'Fuel PHP framework - Agent class (https://fuelphp.com)');
curl_setopt($curl, CURLOPT_URL, static::$config['browscap']['url']);

// add a proxy configuration if needed
Expand Down Expand Up @@ -512,7 +512,7 @@ protected static function parse_browscap()

case 'wrapper':
// set our custom user agent
ini_set('user_agent', 'Fuel PHP framework - Agent class (http://fuelphp.com)');
ini_set('user_agent', 'Fuel PHP framework - Agent class (https://fuelphp.com)');

// create a stream context if needed
$context = null;
Expand Down
4 changes: 2 additions & 2 deletions classes/arr.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
* @version 1.8.1
* @author Fuel Development Team
* @license MIT License
* @copyright 2010 - 2018 Fuel Development Team
* @link http://fuelphp.com
* @copyright 2010 - 2019 Fuel Development Team
* @link https://fuelphp.com
*/

namespace Fuel\Core;
Expand Down
4 changes: 2 additions & 2 deletions classes/asset.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
* @version 1.8.1
* @author Fuel Development Team
* @license MIT License
* @copyright 2010 - 2018 Fuel Development Team
* @link http://fuelphp.com
* @copyright 2010 - 2019 Fuel Development Team
* @link https://fuelphp.com
*/

namespace Fuel\Core;
Expand Down
4 changes: 2 additions & 2 deletions classes/asset/instance.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
* @version 1.8.1
* @author Fuel Development Team
* @license MIT License
* @copyright 2010 - 2018 Fuel Development Team
* @link http://fuelphp.com
* @copyright 2010 - 2019 Fuel Development Team
* @link https://fuelphp.com
*/

namespace Fuel\Core;
Expand Down
4 changes: 2 additions & 2 deletions classes/autoloader.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
* @version 1.8.1
* @author Fuel Development Team
* @license MIT License
* @copyright 2010 - 2018 Fuel Development Team
* @link http://fuelphp.com
* @copyright 2010 - 2019 Fuel Development Team
* @link https://fuelphp.com
*/

namespace Fuel\Core;
Expand Down
4 changes: 2 additions & 2 deletions classes/cache.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
* @version 1.8.1
* @author Fuel Development Team
* @license MIT License
* @copyright 2010 - 2018 Fuel Development Team
* @link http://fuelphp.com
* @copyright 2010 - 2019 Fuel Development Team
* @link https://fuelphp.com
*/

namespace Fuel\Core;
Expand Down
4 changes: 2 additions & 2 deletions classes/cache/handler/driver.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
* @version 1.8.1
* @author Fuel Development Team
* @license MIT License
* @copyright 2010 - 2018 Fuel Development Team
* @link http://fuelphp.com
* @copyright 2010 - 2019 Fuel Development Team
* @link https://fuelphp.com
*/

namespace Fuel\Core;
Expand Down
4 changes: 2 additions & 2 deletions classes/cache/handler/json.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
* @version 1.8.1
* @author Fuel Development Team
* @license MIT License
* @copyright 2010 - 2018 Fuel Development Team
* @link http://fuelphp.com
* @copyright 2010 - 2019 Fuel Development Team
* @link https://fuelphp.com
*/

namespace Fuel\Core;
Expand Down
4 changes: 2 additions & 2 deletions classes/cache/handler/serialized.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
* @version 1.8.1
* @author Fuel Development Team
* @license MIT License
* @copyright 2010 - 2018 Fuel Development Team
* @link http://fuelphp.com
* @copyright 2010 - 2019 Fuel Development Team
* @link https://fuelphp.com
*/

namespace Fuel\Core;
Expand Down
4 changes: 2 additions & 2 deletions classes/cache/handler/string.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
* @version 1.8.1
* @author Fuel Development Team
* @license MIT License
* @copyright 2010 - 2018 Fuel Development Team
* @link http://fuelphp.com
* @copyright 2010 - 2019 Fuel Development Team
* @link https://fuelphp.com
*/

namespace Fuel\Core;
Expand Down
4 changes: 2 additions & 2 deletions classes/cache/notfound.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
* @version 1.8.1
* @author Fuel Development Team
* @license MIT License
* @copyright 2010 - 2018 Fuel Development Team
* @link http://fuelphp.com
* @copyright 2010 - 2019 Fuel Development Team
* @link https://fuelphp.com
*/

namespace Fuel\Core;
Expand Down
4 changes: 2 additions & 2 deletions classes/cache/storage/apc.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
* @version 1.8.1
* @author Fuel Development Team
* @license MIT License
* @copyright 2010 - 2018 Fuel Development Team
* @link http://fuelphp.com
* @copyright 2010 - 2019 Fuel Development Team
* @link https://fuelphp.com
*/

namespace Fuel\Core;
Expand Down
4 changes: 2 additions & 2 deletions classes/cache/storage/driver.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
* @version 1.8.1
* @author Fuel Development Team
* @license MIT License
* @copyright 2010 - 2018 Fuel Development Team
* @link http://fuelphp.com
* @copyright 2010 - 2019 Fuel Development Team
* @link https://fuelphp.com
*/

namespace Fuel\Core;
Expand Down
4 changes: 2 additions & 2 deletions classes/cache/storage/file.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
* @version 1.8.1
* @author Fuel Development Team
* @license MIT License
* @copyright 2010 - 2018 Fuel Development Team
* @link http://fuelphp.com
* @copyright 2010 - 2019 Fuel Development Team
* @link https://fuelphp.com
*/

namespace Fuel\Core;
Expand Down
4 changes: 2 additions & 2 deletions classes/cache/storage/memcached.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
* @version 1.8.1
* @author Fuel Development Team
* @license MIT License
* @copyright 2010 - 2018 Fuel Development Team
* @link http://fuelphp.com
* @copyright 2010 - 2019 Fuel Development Team
* @link https://fuelphp.com
*/

namespace Fuel\Core;
Expand Down
4 changes: 2 additions & 2 deletions classes/cache/storage/redis.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
* @version 1.8.1
* @author Fuel Development Team
* @license MIT License
* @copyright 2010 - 2018 Fuel Development Team
* @link http://fuelphp.com
* @copyright 2010 - 2019 Fuel Development Team
* @link https://fuelphp.com
*/

namespace Fuel\Core;
Expand Down
4 changes: 2 additions & 2 deletions classes/cache/storage/xcache.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
* @version 1.8.1
* @author Fuel Development Team
* @license MIT License
* @copyright 2010 - 2018 Fuel Development Team
* @link http://fuelphp.com
* @copyright 2010 - 2019 Fuel Development Team
* @link https://fuelphp.com
*/

namespace Fuel\Core;
Expand Down
4 changes: 2 additions & 2 deletions classes/cli.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
* @version 1.8.1
* @author Fuel Development Team
* @license MIT License
* @copyright 2010 - 2018 Fuel Development Team
* @link http://fuelphp.com
* @copyright 2010 - 2019 Fuel Development Team
* @link https://fuelphp.com
*/

namespace Fuel\Core;
Expand Down
4 changes: 2 additions & 2 deletions classes/config.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
* @version 1.8.1
* @author Fuel Development Team
* @license MIT License
* @copyright 2010 - 2018 Fuel Development Team
* @link http://fuelphp.com
* @copyright 2010 - 2019 Fuel Development Team
* @link https://fuelphp.com
*/

namespace Fuel\Core;
Expand Down
4 changes: 2 additions & 2 deletions classes/config/db.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
* @version 1.8.1
* @author Fuel Development Team
* @license MIT License
* @copyright 2010 - 2018 Fuel Development Team
* @link http://fuelphp.com
* @copyright 2010 - 2019 Fuel Development Team
* @link https://fuelphp.com
*/

namespace Fuel\Core;
Expand Down
4 changes: 2 additions & 2 deletions classes/config/file.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
* @version 1.8.1
* @author Fuel Development Team
* @license MIT License
* @copyright 2010 - 2018 Fuel Development Team
* @link http://fuelphp.com
* @copyright 2010 - 2019 Fuel Development Team
* @link https://fuelphp.com
*/

namespace Fuel\Core;
Expand Down
4 changes: 2 additions & 2 deletions classes/config/ini.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
* @version 1.8.1
* @author Fuel Development Team
* @license MIT License
* @copyright 2010 - 2018 Fuel Development Team
* @link http://fuelphp.com
* @copyright 2010 - 2019 Fuel Development Team
* @link https://fuelphp.com
*/

namespace Fuel\Core;
Expand Down
4 changes: 2 additions & 2 deletions classes/config/interface.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
* @version 1.8.1
* @author Fuel Development Team
* @license MIT License
* @copyright 2010 - 2018 Fuel Development Team
* @link http://fuelphp.com
* @copyright 2010 - 2019 Fuel Development Team
* @link https://fuelphp.com
*/

namespace Fuel\Core;
Expand Down
4 changes: 2 additions & 2 deletions classes/config/json.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
* @version 1.8.1
* @author Fuel Development Team
* @license MIT License
* @copyright 2010 - 2018 Fuel Development Team
* @link http://fuelphp.com
* @copyright 2010 - 2019 Fuel Development Team
* @link https://fuelphp.com
*/

namespace Fuel\Core;
Expand Down
4 changes: 2 additions & 2 deletions classes/config/memcached.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
* @version 1.8.1
* @author Fuel Development Team
* @license MIT License
* @copyright 2010 - 2018 Fuel Development Team
* @link http://fuelphp.com
* @copyright 2010 - 2019 Fuel Development Team
* @link https://fuelphp.com
*/

namespace Fuel\Core;
Expand Down
4 changes: 2 additions & 2 deletions classes/config/php.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
* @version 1.8.1
* @author Fuel Development Team
* @license MIT License
* @copyright 2010 - 2018 Fuel Development Team
* @link http://fuelphp.com
* @copyright 2010 - 2019 Fuel Development Team
* @link https://fuelphp.com
*/

namespace Fuel\Core;
Expand Down
4 changes: 2 additions & 2 deletions classes/config/yml.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
* @version 1.8.1
* @author Fuel Development Team
* @license MIT License
* @copyright 2010 - 2018 Fuel Development Team
* @link http://fuelphp.com
* @copyright 2010 - 2019 Fuel Development Team
* @link https://fuelphp.com
*/

namespace Fuel\Core;
Expand Down
4 changes: 2 additions & 2 deletions classes/controller.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
* @version 1.8.1
* @author Fuel Development Team
* @license MIT License
* @copyright 2010 - 2018 Fuel Development Team
* @link http://fuelphp.com
* @copyright 2010 - 2019 Fuel Development Team
* @link https://fuelphp.com
*/

namespace Fuel\Core;
Expand Down
4 changes: 2 additions & 2 deletions classes/controller/hybrid.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
* @version 1.8.1
* @author Fuel Development Team
* @license MIT License
* @copyright 2010 - 2018 Fuel Development Team
* @link http://fuelphp.com
* @copyright 2010 - 2019 Fuel Development Team
* @link https://fuelphp.com
*/

namespace Fuel\Core;
Expand Down
4 changes: 2 additions & 2 deletions classes/controller/rest.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
* @version 1.8.1
* @author Fuel Development Team
* @license MIT License
* @copyright 2010 - 2018 Fuel Development Team
* @link http://fuelphp.com
* @copyright 2010 - 2019 Fuel Development Team
* @link https://fuelphp.com
*/

namespace Fuel\Core;
Expand Down
Loading

0 comments on commit 226855f

Please sign in to comment.