From 42763ca5aef5d41738e3ab999f05d78a16df665d Mon Sep 17 00:00:00 2001
From: Thomas Rabaix <thomas.rabaix@gmail.com>
Date: Sat, 21 Mar 2015 09:44:12 +0100
Subject: [PATCH] http => https

---
 .travis.yml                                          |  2 +-
 CONTRIBUTING.md                                      |  2 +-
 README.md                                            |  2 +-
 .../config/doctrine/Gallery.mongodb.xml.skeleton     |  2 +-
 Resources/config/doctrine/Gallery.orm.xml.skeleton   |  2 +-
 Resources/config/doctrine/Gallery.phpcr.xml.skeleton |  2 +-
 .../config/doctrine/GalleryHasMedia.orm.xml.skeleton |  2 +-
 .../doctrine/GalleryHasMedia.phpcr.xml.skeleton      |  2 +-
 Resources/config/doctrine/Media.mongodb.xml.skeleton |  2 +-
 Resources/config/doctrine/Media.orm.xml.skeleton     |  2 +-
 Resources/config/doctrine/Media.phpcr.xml.skeleton   |  2 +-
 Resources/doc/reference/installation.rst             | 12 ++++++------
 Tests/Metadata/AmazonMetadataBuilderTest.php         |  7 +++++++
 composer.json                                        |  4 ++--
 14 files changed, 26 insertions(+), 19 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index ed8b5c3b1..d7e0280e5 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -26,7 +26,7 @@ before_script:
 script: make test
 
 notifications:
-    webhooks: http://sonata-project.org/bundles/media/master/travis
+    webhooks: https://sonata-project.org/bundles/media/master/travis
 
 matrix:
   allow_failures:
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index adeb901dd..06ae638d0 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -4,7 +4,7 @@ Sonata respects the symfony’s conventions about contributing to the code. So b
 
 If you happen to find a bug, we kindly request you to report it. However, before submitting it, please:
 
-  * Check the [project documentation available online](http://sonata-project.org/bundles/)
+  * Check the [project documentation available online](https://sonata-project.org/bundles/)
 
 Then, if it appears that it’s a real bug, you may report it using Github by following these 3 points:
 
diff --git a/README.md b/README.md
index e7f6e6db1..1189ad77d 100644
--- a/README.md
+++ b/README.md
@@ -5,7 +5,7 @@ SonataMediaBundle - Media management on steroids
 
 The ``SonataMediaBundle`` is a media library based on a dedicated ``provider`` which handles different ``type`` of media: files, videos or images.
 
-Check out the documentation on [http://sonata-project.org/bundles/media/master/doc/index.html](http://sonata-project.org/bundles/media/master/doc/index.html)
+Check out the documentation on [https://sonata-project.org/bundles/media/master/doc/index.html](https://sonata-project.org/bundles/media/master/doc/index.html)
 
 **Google Groups**: For questions and proposals you can post on this google groups
 
diff --git a/Resources/config/doctrine/Gallery.mongodb.xml.skeleton b/Resources/config/doctrine/Gallery.mongodb.xml.skeleton
index b4e107a14..5b7c0c3b1 100644
--- a/Resources/config/doctrine/Gallery.mongodb.xml.skeleton
+++ b/Resources/config/doctrine/Gallery.mongodb.xml.skeleton
@@ -4,7 +4,7 @@
                         xsi:schemaLocation="http://doctrine-project.org/schemas/odm/doctrine-mongo-mapping
                         http://doctrine-project.org/schemas/odm/doctrine-mongo-mapping.xsd">
     <!--
-         This file has been generated by the EasyExtends bundle ( http://sonata-project.org/easy-extends )
+         This file has been generated by the EasyExtends bundle ( https://sonata-project.org/easy-extends )
 
          References :
             xsd                  : https://github.com/doctrine/doctrine2/blob/master/doctrine-mapping.xsd
diff --git a/Resources/config/doctrine/Gallery.orm.xml.skeleton b/Resources/config/doctrine/Gallery.orm.xml.skeleton
index a3467aa40..fc1257c1d 100644
--- a/Resources/config/doctrine/Gallery.orm.xml.skeleton
+++ b/Resources/config/doctrine/Gallery.orm.xml.skeleton
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <doctrine-mapping xmlns="http://doctrine-project.org/schemas/orm/doctrine-mapping" xsi="http://www.w3.org/2001/XMLSchema-instance" schemaLocation="http://doctrine-project.org/schemas/orm/doctrine-mapping http://doctrine-project.org/schemas/orm/doctrine-mapping.xsd">
     <!--
-         This file has been generated by the EasyExtends bundle ( http://sonata-project.org/easy-extends )
+         This file has been generated by the EasyExtends bundle ( https://sonata-project.org/easy-extends )
 
          References :
             xsd                  : https://github.com/doctrine/doctrine2/blob/master/doctrine-mapping.xsd
diff --git a/Resources/config/doctrine/Gallery.phpcr.xml.skeleton b/Resources/config/doctrine/Gallery.phpcr.xml.skeleton
index c85181e8d..feb45c0d9 100644
--- a/Resources/config/doctrine/Gallery.phpcr.xml.skeleton
+++ b/Resources/config/doctrine/Gallery.phpcr.xml.skeleton
@@ -4,7 +4,7 @@
                         xsi:schemaLocation="http://doctrine-project.org/schemas/odm/doctrine-mongo-mapping
                         http://doctrine-project.org/schemas/odm/doctrine-mongo-mapping.xsd">
     <!--
-         This file has been generated by the EasyExtends bundle ( http://sonata-project.org/easy-extends )
+         This file has been generated by the EasyExtends bundle ( https://sonata-project.org/easy-extends )
 
          References :
             xsd                  : https://github.com/doctrine/doctrine2/blob/master/doctrine-mapping.xsd
diff --git a/Resources/config/doctrine/GalleryHasMedia.orm.xml.skeleton b/Resources/config/doctrine/GalleryHasMedia.orm.xml.skeleton
index b9c2abede..2c55ea9d7 100644
--- a/Resources/config/doctrine/GalleryHasMedia.orm.xml.skeleton
+++ b/Resources/config/doctrine/GalleryHasMedia.orm.xml.skeleton
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <doctrine-mapping xmlns="http://doctrine-project.org/schemas/orm/doctrine-mapping" xsi="http://www.w3.org/2001/XMLSchema-instance" schemaLocation="http://doctrine-project.org/schemas/orm/doctrine-mapping http://doctrine-project.org/schemas/orm/doctrine-mapping.xsd">
     <!--
-         This file has been generated by the EasyExtends bundle ( http://sonata-project.org/easy-extends )
+         This file has been generated by the EasyExtends bundle ( https://sonata-project.org/easy-extends )
 
          References :
             xsd                  : https://github.com/doctrine/doctrine2/blob/master/doctrine-mapping.xsd
diff --git a/Resources/config/doctrine/GalleryHasMedia.phpcr.xml.skeleton b/Resources/config/doctrine/GalleryHasMedia.phpcr.xml.skeleton
index 13cc38329..039cea578 100644
--- a/Resources/config/doctrine/GalleryHasMedia.phpcr.xml.skeleton
+++ b/Resources/config/doctrine/GalleryHasMedia.phpcr.xml.skeleton
@@ -4,7 +4,7 @@
                         xsi:schemaLocation="http://doctrine-project.org/schemas/odm/doctrine-mongo-mapping
                         http://doctrine-project.org/schemas/odm/doctrine-mongo-mapping.xsd">
     <!--
-         This file has been generated by the EasyExtends bundle ( http://sonata-project.org/easy-extends )
+         This file has been generated by the EasyExtends bundle ( https://sonata-project.org/easy-extends )
 
          References :
             xsd                  : https://github.com/doctrine/doctrine2/blob/master/doctrine-mapping.xsd
diff --git a/Resources/config/doctrine/Media.mongodb.xml.skeleton b/Resources/config/doctrine/Media.mongodb.xml.skeleton
index 709c007b8..13365c5a6 100644
--- a/Resources/config/doctrine/Media.mongodb.xml.skeleton
+++ b/Resources/config/doctrine/Media.mongodb.xml.skeleton
@@ -4,7 +4,7 @@
                         xsi:schemaLocation="http://doctrine-project.org/schemas/odm/doctrine-mongo-mapping
                         http://doctrine-project.org/schemas/odm/doctrine-mongo-mapping.xsd">
     <!--
-         This file has been generated by the EasyExtends bundle ( http://sonata-project.org/easy-extends )
+         This file has been generated by the EasyExtends bundle ( https://sonata-project.org/easy-extends )
 
          References :
             xsd                  : https://github.com/doctrine/doctrine2/blob/master/doctrine-mapping.xsd
diff --git a/Resources/config/doctrine/Media.orm.xml.skeleton b/Resources/config/doctrine/Media.orm.xml.skeleton
index 9e3997180..041e4d62c 100644
--- a/Resources/config/doctrine/Media.orm.xml.skeleton
+++ b/Resources/config/doctrine/Media.orm.xml.skeleton
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <doctrine-mapping xmlns="http://doctrine-project.org/schemas/orm/doctrine-mapping" xsi="http://www.w3.org/2001/XMLSchema-instance" schemaLocation="http://doctrine-project.org/schemas/orm/doctrine-mapping http://doctrine-project.org/schemas/orm/doctrine-mapping.xsd">
     <!--
-         This file has been generated by the EasyExtends bundle ( http://sonata-project.org/easy-extends )
+         This file has been generated by the EasyExtends bundle ( https://sonata-project.org/easy-extends )
 
          References :
             xsd                  : https://github.com/doctrine/doctrine2/blob/master/doctrine-mapping.xsd
diff --git a/Resources/config/doctrine/Media.phpcr.xml.skeleton b/Resources/config/doctrine/Media.phpcr.xml.skeleton
index 213203f25..55782a560 100644
--- a/Resources/config/doctrine/Media.phpcr.xml.skeleton
+++ b/Resources/config/doctrine/Media.phpcr.xml.skeleton
@@ -4,7 +4,7 @@
                         xsi:schemaLocation="http://doctrine-project.org/schemas/odm/doctrine-mongo-mapping
                         http://doctrine-project.org/schemas/odm/doctrine-mongo-mapping.xsd">
     <!--
-         This file has been generated by the EasyExtends bundle ( http://sonata-project.org/easy-extends )
+         This file has been generated by the EasyExtends bundle ( https://sonata-project.org/easy-extends )
 
          References :
             xsd                  : https://github.com/doctrine/doctrine2/blob/master/doctrine-mapping.xsd
diff --git a/Resources/doc/reference/installation.rst b/Resources/doc/reference/installation.rst
index b072b4483..255bb5aaf 100644
--- a/Resources/doc/reference/installation.rst
+++ b/Resources/doc/reference/installation.rst
@@ -6,15 +6,15 @@ Base bundles
 
 This bundle is mainly dependant of:
 
-* Classification: http://sonata-project.org/bundles/classification
-* Core: http://sonata-project.org/bundles/core
-* Intl: http://sonata-project.org/bundles/intl
+* Classification: https://sonata-project.org/bundles/classification
+* Core: https://sonata-project.org/bundles/core
+* Intl: https://sonata-project.org/bundles/intl
 
 This bundle has optional dependancies of:
 
- * Admin: http://sonata-project.org/bundles/admin
- * DoctrineOrm: http://sonata-project.org/bundles/doctrine-orm-admin
- * MongoAdmin: http://sonata-project.org/bundles/mongo-admin
+ * Admin: https://sonata-project.org/bundles/admin
+ * DoctrineOrm: https://sonata-project.org/bundles/doctrine-orm-admin
+ * MongoAdmin: https://sonata-project.org/bundles/mongo-admin
 
 So be sure you have installed those bundles before starting
 
diff --git a/Tests/Metadata/AmazonMetadataBuilderTest.php b/Tests/Metadata/AmazonMetadataBuilderTest.php
index 960b9794d..1d2c04924 100644
--- a/Tests/Metadata/AmazonMetadataBuilderTest.php
+++ b/Tests/Metadata/AmazonMetadataBuilderTest.php
@@ -17,6 +17,13 @@
 
 class AmazonMetadataBuilderTest extends \PHPUnit_Framework_TestCase
 {
+    public function setUp()
+    {
+        if (!class_exists('Aws\S3\Enum\CannedAcl')) {
+            $this->markTestSkipped("Missing Aws\\S3\\Enum\\CannedAcl");
+        }
+    }
+
     public function testAmazon()
     {
         $media = $this->getMock('Sonata\MediaBundle\Model\MediaInterface');
diff --git a/composer.json b/composer.json
index b6d8ebca4..74beeb78f 100644
--- a/composer.json
+++ b/composer.json
@@ -3,13 +3,13 @@
     "type": "symfony-bundle",
     "description": "Symfony SonataMediaBundle",
     "keywords": ["media", "sonata", "youtube", "dailymotion", "vimeo", "pdf", "file", "upload"],
-    "homepage": "http://sonata-project.org/bundles/media",
+    "homepage": "https://sonata-project.org/bundles/media",
     "license": "MIT",
     "authors": [
         {
             "name": "Thomas Rabaix",
             "email": "thomas.rabaix@sonata-project.org",
-            "homepage": "http://sonata-project.org"
+            "homepage": "https://sonata-project.org"
         },
         {
             "name": "Sonata Community",