@@ -52,7 +52,7 @@ |
||
| 52 | 52 | * |
| 53 | 53 | * @param Media|null $value |
| 54 | 54 | * |
| 55 | - * @return integer |
|
| 55 | + * @return Media|null |
|
| 56 | 56 | */ |
| 57 | 57 | public function transform($value) |
| 58 | 58 | { |
@@ -71,11 +71,9 @@ |
||
| 71 | 71 | { |
| 72 | 72 | if (null === $value) { |
| 73 | 73 | return null; |
| 74 | - } |
|
| 75 | - else if ($value->getBinary()) { |
|
| 74 | + } else if ($value->getBinary()) { |
|
| 76 | 75 | return $this->provider->save($value->getBinary(), $value); |
| 77 | - } |
|
| 78 | - else if ($value->getId()) { |
|
| 76 | + } else if ($value->getId()) { |
|
| 79 | 77 | return $value; |
| 80 | 78 | } |
| 81 | 79 | |
@@ -71,7 +71,7 @@ |
||
| 71 | 71 | */ |
| 72 | 72 | public function __toString() |
| 73 | 73 | { |
| 74 | - return $this->getName() ? : ""; |
|
| 74 | + return $this->getName() ?: ""; |
|
| 75 | 75 | } |
| 76 | 76 | |
| 77 | 77 | /** |
@@ -2,7 +2,7 @@ |
||
| 2 | 2 | |
| 3 | 3 | namespace Media\Entity; |
| 4 | 4 | |
| 5 | -use Doctrine\ORM\Mapping AS ORM; |
|
| 5 | +use Doctrine\ORM\Mapping as ORM; |
|
| 6 | 6 | |
| 7 | 7 | /** |
| 8 | 8 | * |
@@ -5,13 +5,13 @@ |
||
| 5 | 5 | class MediaExtension extends \Twig_Extension |
| 6 | 6 | { |
| 7 | 7 | |
| 8 | - /** |
|
| 8 | + /** |
|
| 9 | 9 | * |
| 10 | 10 | * @var \Silex\Application |
| 11 | 11 | */ |
| 12 | 12 | private $app; |
| 13 | 13 | |
| 14 | - /** |
|
| 14 | + /** |
|
| 15 | 15 | * |
| 16 | 16 | * @param \Silex\Application $app |
| 17 | 17 | */ |
@@ -29,7 +29,7 @@ |
||
| 29 | 29 | |
| 30 | 30 | public function media(\Media\Entity\Media $media) |
| 31 | 31 | { |
| 32 | - $url = "uploads/" . intval($media->getId()/1000) . "/" . $media->getName(); |
|
| 32 | + $url = "uploads/" . intval($media->getId() / 1000) . "/" . $media->getName(); |
|
| 33 | 33 | $base = $this->app['request']->getBasePath(); |
| 34 | 34 | return sprintf("%s/%s", $base, $url); |
| 35 | 35 | } |
@@ -22,7 +22,7 @@ |
||
| 22 | 22 | // } |
| 23 | 23 | |
| 24 | 24 | if ($app->offsetExists('form.factory')) { |
| 25 | - $app['form.types'] = $app->share($app->extend('form.types', function ($types) use ($app) { |
|
| 25 | + $app['form.types'] = $app->share($app->extend('form.types', function($types) use ($app) { |
|
| 26 | 26 | $types[] = new Form\Type\MediaType($app); |
| 27 | 27 | return $types; |
| 28 | 28 | })); |
@@ -70,8 +70,7 @@ |
||
| 70 | 70 | |
| 71 | 71 | if (!$media instanceof Media) { |
| 72 | 72 | $media = new Media(); |
| 73 | - } |
|
| 74 | - else { |
|
| 73 | + } else { |
|
| 75 | 74 | $media->setBinary(null); |
| 76 | 75 | } |
| 77 | 76 | |