diff --git a/LICENSE.txt b/LICENSE.txt index cf5c77ecc0a..0161ef111b8 100644 --- a/LICENSE.txt +++ b/LICENSE.txt @@ -1,6 +1,6 @@ The MIT License (MIT) -CakePHP(tm) : The Rapid Development PHP Framework (http://cakephp.org) +CakePHP(tm) : The Rapid Development PHP Framework (https://cakephp.org) Copyright (c) 2005-2017, Cake Software Foundation, Inc. (http://cakefoundation.org) Permission is hereby granted, free of charge, to any person obtaining a copy diff --git a/VERSION.txt b/VERSION.txt index 73c569d3bdd..e407a0b89cd 100644 --- a/VERSION.txt +++ b/VERSION.txt @@ -4,14 +4,14 @@ // // Holds a static string representing the current version of CakePHP // -// CakePHP(tm) : Rapid Development Framework (http://cakephp.org) +// CakePHP(tm) : Rapid Development Framework (https://cakephp.org) // Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org) // // Licensed under The MIT License // Redistributions of files must retain the above copyright notice. // // @copyright Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org) -// @link http://cakephp.org +// @link https://cakephp.org // @since CakePHP(tm) v 0.2.9 // @license http://www.opensource.org/licenses/mit-license.php MIT License // +--------------------------------------------------------------------------------------------+ // diff --git a/config/bootstrap.php b/config/bootstrap.php index f7686f2f5b1..333f55bced7 100644 --- a/config/bootstrap.php +++ b/config/bootstrap.php @@ -1,6 +1,6 @@ Html->image('cake_icon.png', ['alt' => 'CakePHP', 'url' => 'http://cakephp.org']); + * echo $this->Html->image('cake_icon.png', ['alt' => 'CakePHP', 'url' => 'https://cakephp.org']); * ``` * * ### Options: diff --git a/src/View/Helper/IdGeneratorTrait.php b/src/View/Helper/IdGeneratorTrait.php index 289e8a90b17..c92a7321b96 100644 --- a/src/View/Helper/IdGeneratorTrait.php +++ b/src/View/Helper/IdGeneratorTrait.php @@ -1,6 +1,6 @@ '12', 'rght' => '13', 'parent_id' => '6', - 'url' => 'http://cakephp.org', + 'url' => 'https://cakephp.org', 'title' => 'Link 7', ], [ diff --git a/tests/Fixture/NumberTreesFixture.php b/tests/Fixture/NumberTreesFixture.php index 6491a127e71..547f025d1ed 100644 --- a/tests/Fixture/NumberTreesFixture.php +++ b/tests/Fixture/NumberTreesFixture.php @@ -1,6 +1,6 @@ fetch('content'); ?> -

This email was sent using the CakePHP Framework

+

This email was sent using the CakePHP Framework

diff --git a/tests/test_app/TestApp/Template/Layout/Email/html/japanese.ctp b/tests/test_app/TestApp/Template/Layout/Email/html/japanese.ctp index 7915b1a1487..8bf797cc0f3 100644 --- a/tests/test_app/TestApp/Template/Layout/Email/html/japanese.ctp +++ b/tests/test_app/TestApp/Template/Layout/Email/html/japanese.ctp @@ -8,6 +8,6 @@ fetch('content'); ?> -

このメールは CakePHP Framework を利用して送信しました。

+

このメールは CakePHP Framework を利用して送信しました。

diff --git a/tests/test_app/TestApp/Template/Layout/Email/text/default.ctp b/tests/test_app/TestApp/Template/Layout/Email/text/default.ctp index 57f8812f16f..1f816271197 100644 --- a/tests/test_app/TestApp/Template/Layout/Email/text/default.ctp +++ b/tests/test_app/TestApp/Template/Layout/Email/text/default.ctp @@ -1,4 +1,4 @@ fetch('content'); ?> -This email was sent using the CakePHP Framework, http://cakephp.org. \ No newline at end of file +This email was sent using the CakePHP Framework, https://cakephp.org. \ No newline at end of file diff --git a/tests/test_app/TestApp/Template/Layout/Email/text/japanese.ctp b/tests/test_app/TestApp/Template/Layout/Email/text/japanese.ctp index 6df9a4db673..9fca171dc48 100644 --- a/tests/test_app/TestApp/Template/Layout/Email/text/japanese.ctp +++ b/tests/test_app/TestApp/Template/Layout/Email/text/japanese.ctp @@ -1,4 +1,4 @@ fetch('content'); ?> -CakePHP Framework を使って送信したメールです。 http://cakephp.org. \ No newline at end of file +CakePHP Framework を使って送信したメールです。 https://cakephp.org. \ No newline at end of file diff --git a/tests/test_app/TestApp/Template/Layout/default.ctp b/tests/test_app/TestApp/Template/Layout/default.ctp index 4ae3c4b8a30..05a9e2d1f12 100644 --- a/tests/test_app/TestApp/Template/Layout/default.ctp +++ b/tests/test_app/TestApp/Template/Layout/default.ctp @@ -22,7 +22,7 @@ $cakeDescription = 'CakePHP: the rapid development php framework';
diff --git a/tests/test_app/TestApp/Template/Layout/with_flash.ctp b/tests/test_app/TestApp/Template/Layout/with_flash.ctp index db88361d310..aa062926422 100644 --- a/tests/test_app/TestApp/Template/Layout/with_flash.ctp +++ b/tests/test_app/TestApp/Template/Layout/with_flash.ctp @@ -22,7 +22,7 @@ $cakeDescription = 'CakePHP: the rapid development php framework';
diff --git a/tests/test_app/TestApp/Template/Pages/home.ctp b/tests/test_app/TestApp/Template/Pages/home.ctp index e1d43fd6418..09d9b32b5bc 100644 --- a/tests/test_app/TestApp/Template/Pages/home.ctp +++ b/tests/test_app/TestApp/Template/Pages/home.ctp @@ -13,7 +13,7 @@ endif; ?>

- Read the changelog + Read the changelog

@@ -142,7 +142,7 @@ Our primary goal is to provide a structured framework that enables PHP users at

    CakePHP +
  • CakePHP
    • The Rapid Development Framework
  • CakePHP Documentation
    • Your Rapid Development Cookbook
    • diff --git a/tests/test_app/TestApp/View/AppView.php b/tests/test_app/TestApp/View/AppView.php index 06335546126..2dded384abe 100644 --- a/tests/test_app/TestApp/View/AppView.php +++ b/tests/test_app/TestApp/View/AppView.php @@ -1,13 +1,13 @@