From d03a682eebde5b8935bfe6543e7ac33f6030c4b2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc=20W=C3=BCrth?= Date: Sun, 11 Jun 2017 00:27:59 +0200 Subject: [PATCH] Use HTTPS for the bakery.cakephp.org URL --- app/View/Pages/home.ctp | 2 +- .../Templates/skel/View/Pages/home.ctp | 2 +- .../Test/Case/Network/Http/HttpSocketTest.php | 2 +- lib/Cake/Test/Case/Utility/XmlTest.php | 24 +++++++++---------- lib/Cake/Test/Fixture/rss.xml | 12 +++++----- .../test_app/View/Posts/test_nocache_tags.ctp | 2 +- 6 files changed, 22 insertions(+), 22 deletions(-) diff --git a/app/View/Pages/home.ctp b/app/View/Pages/home.ctp index 4e6bbb6a6..871f2acdd 100644 --- a/app/View/Pages/home.ctp +++ b/app/View/Pages/home.ctp @@ -203,7 +203,7 @@ You can also add some CSS styles for your pages at: %s.',
    • -
  • +
    • diff --git a/lib/Cake/Console/Templates/skel/View/Pages/home.ctp b/lib/Cake/Console/Templates/skel/View/Pages/home.ctp index 7d6fdbc47..10a5bc2bb 100644 --- a/lib/Cake/Console/Templates/skel/View/Pages/home.ctp +++ b/lib/Cake/Console/Templates/skel/View/Pages/home.ctp @@ -206,7 +206,7 @@ You can also add some CSS styles for your pages at: %s.',
    • -
  • +
    • diff --git a/lib/Cake/Test/Case/Network/Http/HttpSocketTest.php b/lib/Cake/Test/Case/Network/Http/HttpSocketTest.php index 8332d82ab..68dc31b6b 100644 --- a/lib/Cake/Test/Case/Network/Http/HttpSocketTest.php +++ b/lib/Cake/Test/Case/Network/Http/HttpSocketTest.php @@ -994,7 +994,7 @@ class HttpSocketTest extends CakeTestCase { $this->Socket->config['request']['uri']['host'] = 'bakery.cakephp.org'; $url = $this->Socket->url(); - $this->assertEquals('http://bakery.cakephp.org/', $url); + $this->assertEquals('https://bakery.cakephp.org/', $url); $this->Socket->configUri('http://www.cakephp.org'); $url = $this->Socket->url('/search?q=bar'); diff --git a/lib/Cake/Test/Case/Utility/XmlTest.php b/lib/Cake/Test/Case/Utility/XmlTest.php index cbfe47edf..8be42a347 100644 --- a/lib/Cake/Test/Case/Utility/XmlTest.php +++ b/lib/Cake/Test/Case/Utility/XmlTest.php @@ -823,16 +823,16 @@ XML; $this->assertEquals('2.0', $rssAsArray['rss']['@version']); $this->assertEquals(2, count($rssAsArray['rss']['channel']['item'])); - $atomLink = array('@href' => 'http://bakery.cakephp.org/articles/rss', '@rel' => 'self', '@type' => 'application/rss+xml'); + $atomLink = array('@href' => 'https://bakery.cakephp.org/articles/rss', '@rel' => 'self', '@type' => 'application/rss+xml'); $this->assertEquals($rssAsArray['rss']['channel']['atom:link'], $atomLink); - $this->assertEquals('http://bakery.cakephp.org/', $rssAsArray['rss']['channel']['link']); + $this->assertEquals('https://bakery.cakephp.org/', $rssAsArray['rss']['channel']['link']); $expected = array( 'title' => 'Alertpay automated sales via IPN', - 'link' => 'http://bakery.cakephp.org/articles/view/alertpay-automated-sales-via-ipn', + 'link' => 'https://bakery.cakephp.org/articles/view/alertpay-automated-sales-via-ipn', 'description' => 'I\'m going to show you how I implemented a payment module via the Alertpay payment processor.', 'pubDate' => 'Tue, 31 Aug 2010 01:42:00 -0500', - 'guid' => 'http://bakery.cakephp.org/articles/view/alertpay-automated-sales-via-ipn' + 'guid' => 'https://bakery.cakephp.org/articles/view/alertpay-automated-sales-via-ipn' ); $this->assertSame($expected, $rssAsArray['rss']['channel']['item'][1]); @@ -842,22 +842,22 @@ XML; '@version' => '2.0', 'channel' => array( 'atom:link' => array( - '@href' => 'http://bakery.cakephp.org/articles/rss', + '@href' => 'https://bakery.cakephp.org/articles/rss', '@rel' => 'self', '@type' => 'application/rss+xml' ), 'title' => 'The Bakery: ', - 'link' => 'http://bakery.cakephp.org/', + 'link' => 'https://bakery.cakephp.org/', 'description' => 'Recent Articles at The Bakery.', 'pubDate' => 'Sun, 12 Sep 2010 04:18:26 -0500', 'item' => array( array( 'title' => 'CakePHP 1.3.4 released', - 'link' => 'http://bakery.cakephp.org/articles/view/cakephp-1-3-4-released' + 'link' => 'https://bakery.cakephp.org/articles/view/cakephp-1-3-4-released' ), array( 'title' => 'Wizard Component 1.2 Tutorial', - 'link' => 'http://bakery.cakephp.org/articles/view/wizard-component-1-2-tutorial' + 'link' => 'https://bakery.cakephp.org/articles/view/wizard-component-1-2-tutorial' ) ) ) @@ -868,18 +868,18 @@ XML; - + The Bakery: - http://bakery.cakephp.org/ + https://bakery.cakephp.org/ Recent Articles at The Bakery. Sun, 12 Sep 2010 04:18:26 -0500 CakePHP 1.3.4 released - http://bakery.cakephp.org/articles/view/cakephp-1-3-4-released + https://bakery.cakephp.org/articles/view/cakephp-1-3-4-released Wizard Component 1.2 Tutorial - http://bakery.cakephp.org/articles/view/wizard-component-1-2-tutorial + https://bakery.cakephp.org/articles/view/wizard-component-1-2-tutorial diff --git a/lib/Cake/Test/Fixture/rss.xml b/lib/Cake/Test/Fixture/rss.xml index 172649d40..942752a62 100644 --- a/lib/Cake/Test/Fixture/rss.xml +++ b/lib/Cake/Test/Fixture/rss.xml @@ -1,9 +1,9 @@ - + The Bakery: - http://bakery.cakephp.org/ + https://bakery.cakephp.org/ Recent Articles at The Bakery. en-us Wed, 01 Sep 2010 12:09:25 -0500 @@ -13,21 +13,21 @@ gwoo@cakephp.org (Garrett Woodworth) EpisodeCMS - http://bakery.cakephp.org/articles/view/episodecms + https://bakery.cakephp.org/articles/view/episodecms EpisodeCMS is CakePHP based content management system. Features: control panel, events API, module management, multilanguage and translations, themes http://episodecms.com/ Please help me to improve it. Thanks. Tue, 31 Aug 2010 02:07:02 -0500 - http://bakery.cakephp.org/articles/view/episodecms + https://bakery.cakephp.org/articles/view/episodecms Alertpay automated sales via IPN - http://bakery.cakephp.org/articles/view/alertpay-automated-sales-via-ipn + https://bakery.cakephp.org/articles/view/alertpay-automated-sales-via-ipn I'm going to show you how I implemented a payment module via the Alertpay payment processor. Tue, 31 Aug 2010 01:42:00 -0500 - http://bakery.cakephp.org/articles/view/alertpay-automated-sales-via-ipn + https://bakery.cakephp.org/articles/view/alertpay-automated-sales-via-ipn \ No newline at end of file diff --git a/lib/Cake/Test/test_app/View/Posts/test_nocache_tags.ctp b/lib/Cake/Test/test_app/View/Posts/test_nocache_tags.ctp index 5f94bfc22..ce57dcdd5 100644 --- a/lib/Cake/Test/test_app/View/Posts/test_nocache_tags.ctp +++ b/lib/Cake/Test/test_app/View/Posts/test_nocache_tags.ctp @@ -101,7 +101,7 @@ if (!empty($filePresent)):