TheCoreDev/sterivein
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

PHP-CS fixer pass

Browse Source
This commit is contained in:
Franck Allimant
2014-07-01 01:07:56 +02:00
parent f820a09a1a
commit 811e89f740
20 changed files with 48 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
core/lib/Thelia/Controller/Admin/FileController.php
View File

@@ -15,7 +15,7 @@ namespace Thelia\Controller\Admin;
use Propel\Runtime\Exception\PropelException;
use Symfony\Component\HttpFoundation\File\UploadedFile;
use Thelia\Core\Event\File\FileCreateOrUpdateEvent;
use Thelia\Core\Event\Image\FileDeleteEvent;
use Thelia\Core\Event\File\FileDeleteEvent;
use Thelia\Core\Event\TheliaEvents;
use Thelia\Core\Event\UpdateFilePositionEvent;
use Thelia\Core\HttpFoundation\Response;
@@ -56,10 +56,10 @@ class FileController extends BaseAdminController
/**
* Manage how a file collection has to be saved
*
* @param int $parentId Parent id owning files being saved
* @param string $parentType Parent Type owning files being saved (product, category, content, etc.)
* @param string $objectType Object type, e.g. image or document
* @param array $validMimeTypes an array of valid mime types. If empty, any mime type is allowed.
* @param int $parentId Parent id owning files being saved
* @param string $parentType Parent Type owning files being saved (product, category, content, etc.)
* @param string $objectType Object type, e.g. image or document
* @param array $validMimeTypes an array of valid mime types. If empty, any mime type is allowed.
*
* @return Response
*/
@@ -322,14 +322,13 @@ class FileController extends BaseAdminController
));
}
/**
* Manage how a file is updated
*
* @param int $fileId File identifier
* @param int $fileId File identifier
* @param string $parentType Parent Type owning file being saved
* @param string $objectType the type of the file, image or document
* @param string $eventName the event type.
* @param string $eventName the event type.
*
* @return FileModelInterface
*/
@@ -421,7 +420,6 @@ class FileController extends BaseAdminController
return $fileModelInstance;
}
/**
* Manage how an image is updated
*
@@ -471,14 +469,13 @@ class FileController extends BaseAdminController
));
}
/**
* Manage how a image has to be deleted (AJAX)
*
* @param int $fileId Parent id owning image being deleted
* @param int $fileId Parent id owning image being deleted
* @param string $parentType Parent Type owning image being deleted
* @param string $objectType the type of the file, image or document
* @param string $eventName the event type.
* @param string $eventName the event type.
*
* @return Response
*/
@@ -546,7 +543,6 @@ class FileController extends BaseAdminController
return new Response($message);
}
/**
* Manage how a image has to be deleted (AJAX)
*
@@ -632,4 +628,4 @@ class FileController extends BaseAdminController
return $this->updateFilePositionAction($parentType, $documentId, 'document', TheliaEvents::DOCUMENT_UPDATE_POSITION);
}
}
}

2
core/lib/Thelia/Controller/Admin/ProductController.php
View File

@@ -215,7 +215,7 @@ class ProductController extends AbstractSeoCrudController
}
/**
* @param Product $object
* @param Product $object
* @return ProductModificationForm
*/
protected function hydrateObjectForm($object)

16
core/lib/Thelia/Controller/Front/BaseFrontController.php
View File

@@ -35,9 +35,9 @@ class BaseFrontController extends BaseController
/**
* Return the route path defined for the givent route ID
*
* @param string $routeId the route ID, as found in Config/Resources/routing/admin.xml
* @param array $parameters the Route parameters, as a var/value pair array
* @param bool $referenceType Router::ABSOLUTE_PATH or Router::ABSOLUTE_URL
* @param string $routeId the route ID, as found in Config/Resources/routing/admin.xml
* @param array $parameters the Route parameters, as a var/value pair array
* @param bool $referenceType Router::ABSOLUTE_PATH or Router::ABSOLUTE_URL
*
* @see \Thelia\Controller\BaseController::getRouteFromRouter()
*
@@ -51,10 +51,10 @@ class BaseFrontController extends BaseController
/**
* Redirect to a specific route.
*
* @param string $routeId the route ID, as found in Config/Resources/routing/admin.xml
* @param array $urlParameters the URL parameters, as a var/value pair array
* @param array $routeParameters the Route parameters, as a var/value pair array
* @param bool $referenceType Router::ABSOLUTE_PATH or Router::ABSOLUTE_URL
* @param string $routeId the route ID, as found in Config/Resources/routing/admin.xml
* @param array $urlParameters the URL parameters, as a var/value pair array
* @param array $routeParameters the Route parameters, as a var/value pair array
* @param bool $referenceType Router::ABSOLUTE_PATH or Router::ABSOLUTE_URL
*/
public function redirectToRoute($routeId, array $urlParameters = [], array $routeParameters = [], $referenceType = Router::ABSOLUTE_PATH)
{
@@ -140,7 +140,7 @@ class BaseFrontController extends BaseController
* Render the given template, and returns the result as a string.
*
* @param string $templateName the complete template name, with extension
* @param array $args the template arguments
* @param array $args the template arguments
* @param string$templateDir
*
* @return string