sminnee / silverstripe-framework

filesystem/ImageManipulation.php

Doc Comments +15 added lines, -15 removed lines

@@ -168,7 +168,7 @@ 
 	 *
 	 * @param integer $width The width to size to
 	 * @param integer $height The height to size to
-	 * @return AssetContainer
+	 * @return ImageManipulation
 	 */
 	public function Pad($width, $height, $backgroundColor = 'FFFFFF') {
 		if($this->isSize($width, $height)) {
@@ -187,7 +187,7 @@ 
 	/**
 	 * Forces the image to be resampled, if possible
 	 *
-	 * @return AssetContainer
+	 * @return ImageManipulation
 	 */
 	public function Resampled() {
 		// If image is already resampled, return self reference
@@ -237,7 +237,7 @@ 
 	 *
 	 * @param integer $width Width to resize to
 	 * @param integer $height Height to resize to
-	 * @return AssetContainer
+	 * @return ImageManipulation
 	 */
 	public function ResizedImage($width, $height) {
 		if($this->isSize($width, $height)) {
@@ -255,7 +255,7 @@ 
 	 *
 	 * @param integer $width The width to size within
 	 * @param integer $height The height to size within
-	 * @return AssetContainer
+	 * @return null|ImageManipulation
 	 */
 	public function Fit($width, $height) {
 		// Prevent divide by zero on missing/blank file
@@ -293,7 +293,7 @@ 
 	 * @uses ScalingManipulation::Fit()
 	 * @param integer $width The maximum width of the output image
 	 * @param integer $height The maximum height of the output image
-	 * @return AssetContainer
+	 * @return ImageManipulation
 	 */
 	public function FitMax($width, $height) {
 		return $this->getWidth() > $width || $this->getHeight() > $height
@@ -306,7 +306,7 @@ 
 	 * Scale image proportionally by width. Use in templates with $ScaleWidth.
 	 *
 	 * @param integer $width The width to set
-	 * @return AssetContainer
+	 * @return ImageManipulation
 	 */
 	public function ScaleWidth($width) {
 		if($this->isWidth($width)) {
@@ -325,7 +325,7 @@ 
 	 *
 	 * @uses ScalingManipulation::ScaleWidth()
 	 * @param integer $width The maximum width of the output image
-	 * @return AssetContainer
+	 * @return ImageManipulation
 	 */
 	public function ScaleMaxWidth($width) {
 		return $this->getWidth() > $width
@@ -337,7 +337,7 @@ 
 	 * Scale image proportionally by height. Use in templates with $ScaleHeight.
 	 *
 	 * @param int $height The height to set
-	 * @return AssetContainer
+	 * @return ImageManipulation
 	 */
 	public function ScaleHeight($height) {
 		if($this->isHeight($height)) {
@@ -356,7 +356,7 @@ 
 	 *
 	 * @uses ScalingManipulation::ScaleHeight()
 	 * @param integer $height The maximum height of the output image
-	 * @return AssetContainer
+	 * @return ImageManipulation
 	 */
 	public function ScaleMaxHeight($height) {
 		return $this->getHeight() > $height
@@ -371,7 +371,7 @@ 
 	 *
 	 * @uses CropManipulation::Fill()
 	 * @param integer $width The maximum width of the output image
-	 * @return AssetContainer
+	 * @return ImageManipulation
 	 */
 	public function CropWidth($width) {
 		return $this->getWidth() > $width
@@ -385,7 +385,7 @@ 
 	 *
 	 * @uses CropManipulation::Fill()
 	 * @param integer $height The maximum height of the output image
-	 * @return AssetContainer
+	 * @return ImageManipulation
 	 */
 	public function CropHeight($height) {
 		return $this->getHeight() > $height
@@ -401,7 +401,7 @@ 
 	 * @uses ImageManipulation::Fill()
 	 * @param integer $width The relative (used to determine aspect ratio) and maximum width of the output image
 	 * @param integer $height The relative (used to determine aspect ratio) and maximum height of the output image
-	 * @return AssetContainer
+	 * @return null|ImageManipulation
 	 */
 	public function FillMax($width, $height) {
 		// Prevent divide by zero on missing/blank file
@@ -436,7 +436,7 @@ 
 	 *
 	 * @param integer $width Width to crop to
 	 * @param integer $height Height to crop to
-	 * @return AssetContainer
+	 * @return ImageManipulation
 	 */
 	public function Fill($width, $height) {
 		if($this->isSize($width, $height)) {
@@ -487,7 +487,7 @@ 
 	 *
 	 * @param int $width
 	 * @param int $height
-	 * @return AssetContainer
+	 * @return ImageManipulation
 	 */
 	public function Thumbnail($width, $height) {
 		return $this->Pad($height, $height);
@@ -509,7 +509,7 @@ 
 	/**
 	 * Get HTML for img containing the icon for this file
 	 *
-	 * @return type
+	 * @return DBField
 	 */
 	public function IconTag() {
 		return DBField::create_field(

filesystem/storage/DBFile.php

Unused Use Statements -1 removed lines

@@ -5,7 +5,6 @@
 use SilverStripe\Filesystem\ImageManipulation;
 use SilverStripe\Filesystem\Storage\AssetContainer;
 use SilverStripe\Filesystem\Storage\AssetStore;
-
 use Injector;
 use AssetField;
 use File;

model/fieldtypes/DBClassName.php

Doc Comments +3 added lines

@@ -186,6 +186,9 @@
 		return $classNames;
 	}
 
+	/**
+	 * @param \DBClassNameTest_ObjectSubClass $record
+	 */
 	public function setValue($value, $record = null, $markChanged = true) {
 		parent::setValue($value, $record, $markChanged);
 

model/fieldtypes/PolymorphicForeignKey.php

Unused Use Statements -2 removed lines

@@ -2,9 +2,7 @@
 
 namespace SilverStripe\Model\FieldType;
 
-use DB;
 use DataObject;
-use ClassInfo;
 
 /**
  * A special ForeignKey class that handles relations with arbitrary class types

model/fieldtypes/PrimaryKey.php

Unused Use Statements -2 removed lines

@@ -2,8 +2,6 @@
 
 namespace SilverStripe\Model\FieldType;
 
-use DataList;
-use DropdownField;
 use DB;
 use DataObject;