Permalink
Browse files

Merge pull request #57 from Kunstmaan/fix/annotations

code formatting / annotations cleanup
  • Loading branch information...
2 parents 775f451 + f6a716b commit 8d5e91ce7f610f45694a5ce90686556775bad963 Kim Ausloos committed May 22, 2012
Showing with 12 additions and 11 deletions.
  1. +7 −6 Entity/Image.php
  2. +5 −5 Entity/Video.php
View
13 Entity/Image.php
@@ -77,14 +77,14 @@ public function addEdits(Image $edits)
/**
* Get edits
*
- * @return Doctrine\Common\Collections\Collection
+ * @return Doctrine\Common\Collections\Collection
*/
public function getEdits()
{
return $this->edits;
}
- /**
+ /**
* Add edits
*
* @param Kunstmaan\MediaBundle\Entity\Image $edits
@@ -93,8 +93,9 @@ public function addImage(Image $edits)
{
$this->edits[] = $edits;
}
-
- public function __tostring(){
- return $this->getName();
+
+ public function __tostring()
+ {
+ return $this->getName();
}
-}
+}
View
10 Entity/Video.php
@@ -1,7 +1,6 @@
<?php
namespace Kunstmaan\MediaBundle\Entity;
-
use Doctrine\ORM\Mapping as ORM;
/**
@@ -36,12 +35,13 @@ public function getContext()
return $this::CONTEXT;
}
- public function show($format=null, $options = array())
+ public function show($format = null, $options = array())
{
return '';
}
- public function getCode(){
+ public function getCode()
+ {
return $this->metadata['uuid'];
}
@@ -58,10 +58,10 @@ public function setType($type)
/**
* Get slidetype
*
- * @return string
+ * @return string
*/
public function getType()
{
return $this->type;
}
-}
+}

0 comments on commit 8d5e91c

Please sign in to comment.