Upgrade symfony version

ShurikAg · Sep 2, 2015 · 3674b14 · 3674b14
1 parent 64d3fd1
commit 3674b14
Show file tree

Hide file tree

Showing 5 changed files with 181 additions and 162 deletions.
diff --git a/Tests/Entity/MediaTest.php b/Tests/Entity/MediaTest.php
@@ -23,6 +23,7 @@ class MediaTest extends \PHPUnit_Framework_TestCase
     protected function setUp()
     {
         parent::setUp();
+
         $this->media = new Media();
     }
 
@@ -32,6 +33,7 @@ protected function setUp()
     protected function tearDown()
     {
         $this->media = null;
+
         parent::tearDown();
     }
 
@@ -78,14 +80,6 @@ public function testSetGetSize()
         $this->assertEquals(987987, $this->media->getSize());
     }
 
-    /**
-     * Tests Media->getMedia()
-     */
-    public function testSetGetMedia()
-    {
-        $this->assertNull($this->media->getMedia());
-    }
-
     /**
      * Tests Media->setTag()
      */

diff --git a/build/build.xml b/build/build.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <project name="ArnmMediaBundle" default="build" basedir="..">
-	<target name="build"
-		depends="prepare,lint,phploc,pdepend,phpmd-ci,phpcs-ci,phpcpd,phpdoc,phpunit,phpcb" />
+	<target name="build" depends="prepare,lint,phploc,pdepend,phpmd-ci,phpcs-ci,phpcpd,phpdoc,phpunit,phpcb" />
+	<target name="build-short" depends="prepare,lint,phpunit" />
 
 	<target name="build-parallel" depends="prepare,lint,tools-parallel,phpunit,phpcb" />
 

diff --git a/cache.properties b/cache.properties
@@ -1,28 +1,31 @@
-#Mon Oct 20 02:25:42 UTC 2014
+#Wed Sep 02 04:31:56 UTC 2015
 /var/www/bundles/ArnmMediaBundle/Entity/MediaRepository.php=fa42f4b73ecadbe4a964db3dc9474135
 /www/bundles/ArnmMediaBundle/Controller/MediaController.php=4088f2205f4a598d42eb1081525b567c
 /var/www/bundles/ArnmMediaBundle/DependencyInjection/ArnmMediaExtension.php=0a1e2eeb1911cfbc2248365abe1d74a0
 /www/bundles/ArnmMediaBundle/Tests/Entity/MediaTest.php=e8d6ec318f7c70affaf91ec5f17cbe9d
+/var/www/bundles/ArnmMediaBundle/Model/MediaModel.php=369d56e1c5ff49f915533ceac1507c4d
 /var/www/bundles/ArnmMediaBundle/FormData/MediaData.php=111eb51f980af610b2e77c3072987c36
 /www/bundles/ArnmMediaBundle/DependencyInjection/ArnmMediaExtension.php=ba456679a1c82d2eac4ad398faac9635
-/var/www/bundles/ArnmMediaBundle/Controller/MediaRenderController.php=9f10b8cf7fa2b1c80e2dc6d41750ead0
+/var/www/bundles/ArnmMediaBundle/Controller/MediaRenderController.php=44d58c94913c5bd7c6cc095fe04b9faa
 /www/bundles/ArnmMediaBundle/Form/MediaType.php=ec2ebb6f620862cc08db53b4c7320c36
-/var/www/bundles/ArnmMediaBundle/Form/MediaType.php=2175826af7cd8fbc8c9d5810fdc3b294
-/var/www/bundles/ArnmMediaBundle/Service/MediaManager.php=15edc9a3df715340d9e77ade144f2c83
+/var/www/bundles/ArnmMediaBundle/Form/MediaType.php=caf2814bab830d3cc05149510cd6f73d
+/var/www/bundles/ArnmMediaBundle/Service/MediaManager.php=89b539ab6cc7e0e76ae140ad7efd355f
 /var/www/bundles/ArnmMediaBundle/ArnmMediaBundle.php=a53dbc82b654415abc45c5f1392fe9a9
 /www/bundles/ArnmMediaBundle/ArnmMediaBundle.php=a53dbc82b654415abc45c5f1392fe9a9
-/var/www/bundles/ArnmMediaBundle/Controller/MediaController.php=ca413755500c20d225430704841f3eb5
+/var/www/bundles/ArnmMediaBundle/Controller/MediaController.php=81bd64cd49670ff198b273e6d2692614
 /var/www/bundles/ArnmMediaBundle/Entity/Media.php=c40af87153879caec7a2e3506e304d41
-/var/www/bundles/ArnmMediaBundle/Service/Storage/S3Storage.php=5ba84e51fe69a8b03972fff832b61be8
+/var/www/bundles/ArnmMediaBundle/Service/Storage/S3Storage.php=679eda4d238947ea8a501a74b5a4645d
+/var/www/bundles/ArnmMediaBundle/Tests/Entity/MediaTest.php=8f8da279ebfe5b6874e8f4f56deff849
 /var/www/bundles/ArnmMediaBundle/Tests/Services/Storage/S3StorageTest.php=4a15f6e08ec6ced0f1c2135ff014e862
-/var/www/bundles/ArnmMediaBundle/Tests/Entity/MediaTest.php=e8d6ec318f7c70affaf91ec5f17cbe9d
 /var/www/bundles/ArnmMediaBundle/Service/Storage/MediaStorageInterface.php=5e2c4889e8b8df5246a075927113e0b5
 /var/www/bundles/ArnmMediaBundle/Tests/bootstrap.php=7a9ad34128ac00a0f84550ebf363bf69
+/var/www/bundles/ArnmMediaBundle/Tests/Services/Graphics/ImageTransformerTest.php=7e6801c992627481ebf0460d2888d95f
 /www/bundles/ArnmMediaBundle/Entity/MediaRepository.php=6ef639f5ce4fd0bc2f783ec3935e1d17
 /var/www/bundles/ArnmMediaBundle/Entity/Attribute.php=969a17df0ec23f0060408d2ff27378d8
 /www/bundles/ArnmMediaBundle/Tests/bootstrap.php=7a9ad34128ac00a0f84550ebf363bf69
 /www/bundles/ArnmMediaBundle/Entity/Attribute.php=969a17df0ec23f0060408d2ff27378d8
-/var/www/bundles/ArnmMediaBundle/Tests/Services/MediaManagerTest.php=4f41ab628e543a38a9a7a93aea83baef
+/var/www/bundles/ArnmMediaBundle/Service/Graphics/ImageTransformer.php=7ae9e645922a90b31ec252d5beef0e02
+/var/www/bundles/ArnmMediaBundle/Tests/Services/MediaManagerTest.php=9263dc1ad47e9091c7a8956512683e24
 /www/bundles/ArnmMediaBundle/Entity/Media.php=9668376c0f13a9b9ed39aa485c86c7b3
 /var/www/bundles/ArnmMediaBundle/DependencyInjection/Configuration.php=f886a200c9a46683ea9f7498c46dfbc3
 /www/bundles/ArnmMediaBundle/DependencyInjection/Configuration.php=b50b01e28163ab6124297f3108741750

diff --git a/composer.json b/composer.json
@@ -1,15 +1,15 @@
 {
   "name" : "iibs/arnm-media",
   "description" : "Araneum's media bundle",
-  "version" : "1.0.3",
+  "version" : "1.0.4",
   "require" : {
-    "php" : ">=5.3.3",
-    "symfony/symfony" : "2.5.*",
-    "doctrine/orm" : ">=2.2.3,<2.4-dev",
-    "doctrine/doctrine-bundle": "~1.2",
-    "stof/doctrine-extensions-bundle" : "dev-master",
-    "platinumpixs/aws-symfony2-bundle" : "1.0.0",
-    "doctrine/doctrine-cache-bundle" : "1.0.0",
+    "php": ">=5.3.9",
+    "symfony/symfony": "2.7.*",
+    "doctrine/orm": "~2.2,>=2.2.3,<2.5",
+    "doctrine/doctrine-bundle": "~1.4",
+    "stof/doctrine-extensions-bundle": "dev-master",
+    "platinumpixs/aws-symfony2-bundle": "1.2.*",
+    "doctrine/doctrine-cache-bundle": "~1.0",
     "iibs/arnm-core" : "1.0.*",
     "imagine/imagine" : "~0.6.1",
     "liip/imagine-bundle" : "~1.0.6"