From 9fe4694f43d4ade54ceec4c2b50befd3c4f9ba78 Mon Sep 17 00:00:00 2001 From: Dennis Eichhorn Date: Sat, 23 Jan 2016 10:17:21 +0100 Subject: [PATCH] Remove namespace from scalars --- Controller.php | 16 ++++---- Models/Collection.php | 6 +-- Models/CollectionMapper.php | 6 +-- Models/Media.php | 80 ++++++++++++++++++------------------- Models/MediaMapper.php | 6 +-- Models/UploadFile.php | 36 ++++++++--------- 6 files changed, 75 insertions(+), 75 deletions(-) diff --git a/Controller.php b/Controller.php index efa371a..172e144 100644 --- a/Controller.php +++ b/Controller.php @@ -48,7 +48,7 @@ class Controller extends ModuleAbstract implements WebInterface /** * Module path. * - * @var \string + * @var string * @since 1.0.0 */ const MODULE_PATH = __DIR__; @@ -56,7 +56,7 @@ class Controller extends ModuleAbstract implements WebInterface /** * Module version. * - * @var \string + * @var string * @since 1.0.0 */ const MODULE_VERSION = '1.0.0'; @@ -64,7 +64,7 @@ class Controller extends ModuleAbstract implements WebInterface /** * Module name. * - * @var \string + * @var string * @since 1.0.0 */ const MODULE_NAME = 'Media'; @@ -72,7 +72,7 @@ class Controller extends ModuleAbstract implements WebInterface /** * Localization files. * - * @var \string + * @var string * @since 1.0.0 */ protected static $localization = [ @@ -82,7 +82,7 @@ class Controller extends ModuleAbstract implements WebInterface /** * Providing. * - * @var \string + * @var string * @since 1.0.0 */ protected static $providing = []; @@ -90,7 +90,7 @@ class Controller extends ModuleAbstract implements WebInterface /** * Dependencies. * - * @var \string + * @var string * @since 1.0.0 */ protected static $dependencies = [ @@ -213,7 +213,7 @@ class Controller extends ModuleAbstract implements WebInterface * @since 1.0.0 * @author Dennis Eichhorn */ - public function uploadFiles(array $files, \int $account) : array + public function uploadFiles(array $files, int $account) : array { $mediaCreated = []; @@ -255,7 +255,7 @@ class Controller extends ModuleAbstract implements WebInterface * @since 1.0.0 * @author Dennis Eichhorn */ - private function createNavigation(\int $pageId, RequestAbstract $request, ResponseAbstract $response) + private function createNavigation(int $pageId, RequestAbstract $request, ResponseAbstract $response) { $nav = Navigation::getInstance($request, $this->app->dbPool); $navView = new NavigationView($this->app, $request, $response); diff --git a/Models/Collection.php b/Models/Collection.php index 68c147c..f0bf053 100644 --- a/Models/Collection.php +++ b/Models/Collection.php @@ -34,7 +34,7 @@ class Collection extends Media /** * Resource id. * - * @var \int[] + * @var int[] * @since 1.0.0 */ private $sources = []; @@ -67,14 +67,14 @@ class Collection extends Media /** * Set sources. * - * @param \int $source Source + * @param int $source Source * * @return void * * @since 1.0.0 * @author Dennis Eichhorn */ - public function addSource(\int $source) + public function addSource(int $source) { $this->sources[] = $source; } diff --git a/Models/CollectionMapper.php b/Models/CollectionMapper.php index 85eb179..ced0912 100644 --- a/Models/CollectionMapper.php +++ b/Models/CollectionMapper.php @@ -33,7 +33,7 @@ class CollectionMapper extends MediaMapper /** * Primary table. * - * @var \string + * @var string * @since 1.0.0 */ protected static $table = 'media'; @@ -41,7 +41,7 @@ class CollectionMapper extends MediaMapper /** * Created at. * - * @var \string + * @var string * @since 1.0.0 */ protected static $createdAt = 'media_created_at'; @@ -49,7 +49,7 @@ class CollectionMapper extends MediaMapper /** * Primary field name. * - * @var \string + * @var string * @since 1.0.0 */ protected static $primaryField = 'media_id'; diff --git a/Models/Media.php b/Models/Media.php index c714623..3ba0d16 100644 --- a/Models/Media.php +++ b/Models/Media.php @@ -32,7 +32,7 @@ class Media /** * ID. * - * @var \int + * @var int * @since 1.0.0 */ protected $id = 0; @@ -40,7 +40,7 @@ class Media /** * Name. * - * @var \string + * @var string * @since 1.0.0 */ protected $name = ''; @@ -48,7 +48,7 @@ class Media /** * Extension. * - * @var \string + * @var string * @since 1.0.0 */ protected $extension = ''; @@ -56,7 +56,7 @@ class Media /** * File size in bytes. * - * @var \int + * @var int * @since 1.0.0 */ protected $size = 0; @@ -64,7 +64,7 @@ class Media /** * Author. * - * @var \int + * @var int * @since 1.0.0 */ protected $createdBy = 0; @@ -80,7 +80,7 @@ class Media /** * Resource path. * - * @var \string + * @var string * @since 1.0.0 */ protected $path = ''; @@ -88,7 +88,7 @@ class Media /** * Is versioned. * - * @var \bool + * @var bool * @since 1.0.0 */ protected $versioned = false; @@ -96,7 +96,7 @@ class Media /** * Media Description. * - * @var \string + * @var string * @since 1.0.0 */ protected $description = ''; @@ -129,36 +129,36 @@ class Media } /** - * @return \int + * @return int * * @since 1.0.0 * @author Dennis Eichhorn */ - public function getId() : \int + public function getId() : int { return $this->id; } /** - * @param \int $id Id + * @param int $id Id * * @return void * * @since 1.0.0 * @author Dennis Eichhorn */ - public function setId(\int $id) + public function setId(int $id) { $this->id = $id; } /** - * @return \int + * @return int * * @since 1.0.0 * @author Dennis Eichhorn */ - public function getCreatedBy() : \int + public function getCreatedBy() : int { return $this->createdBy; } @@ -175,69 +175,69 @@ class Media } /** - * @return \string + * @return string * * @since 1.0.0 * @author Dennis Eichhorn */ - public function getExtension() : \string + public function getExtension() : string { return $this->extension; } /** - * @return \string + * @return string * * @since 1.0.0 * @author Dennis Eichhorn */ - public function getPath() : \string + public function getPath() : string { return $this->path; } /** - * @return \string + * @return string * * @since 1.0.0 * @author Dennis Eichhorn */ - public function getName() : \string + public function getName() : string { return $this->name; } /** - * @return \string + * @return string * * @since 1.0.0 * @author Dennis Eichhorn */ - public function getDescription() : \string + public function getDescription() : string { return $this->description; } /** - * @return \int + * @return int * * @since 1.0.0 * @author Dennis Eichhorn */ - public function getSize() : \int + public function getSize() : int { return $this->size; } /** - * @param \int $createdBy Creator + * @param int $createdBy Creator * * @return void * * @since 1.0.0 * @author Dennis Eichhorn */ - public function setCreatedBy(\int $createdBy) + public function setCreatedBy(int $createdBy) { $this->createdBy = $createdBy; } @@ -256,90 +256,90 @@ class Media } /** - * @param \string $extension Extension + * @param string $extension Extension * * @return void * * @since 1.0.0 * @author Dennis Eichhorn */ - public function setExtension(\string $extension) + public function setExtension(string $extension) { $this->extension = $extension; } /** - * @param \string $path $filepath + * @param string $path $filepath * * @return void * * @since 1.0.0 * @author Dennis Eichhorn */ - public function setPath(\string $path) + public function setPath(string $path) { $this->path = $path; } /** - * @param \string $name Media name (not file name) + * @param string $name Media name (not file name) * * @return void * * @since 1.0.0 * @author Dennis Eichhorn */ - public function setName(\string $name) + public function setName(string $name) { $this->name = $name; } /** - * @param \string $description Media description + * @param string $description Media description * * @return void * * @since 1.0.0 * @author Dennis Eichhorn */ - public function setDescription(\string $description) + public function setDescription(string $description) { $this->description = $description; } /** - * @param \int $size Filesize + * @param int $size Filesize * * @return void * * @since 1.0.0 * @author Dennis Eichhorn */ - public function setSize(\int $size) + public function setSize(int $size) { $this->size = $size; } /** - * @param \bool $versioned File is version controlled + * @param bool $versioned File is version controlled * * @return void * * @since 1.0.0 * @author Dennis Eichhorn */ - public function setVersioned(\bool $versioned) + public function setVersioned(bool $versioned) { $this->versioned = $versioned; } /** - * @return \bool + * @return bool * * @since 1.0.0 * @author Dennis Eichhorn */ - public function getVersioned() : \bool + public function getVersioned() : bool { return $this->versioned; } diff --git a/Models/MediaMapper.php b/Models/MediaMapper.php index f027b56..b42bbf7 100644 --- a/Models/MediaMapper.php +++ b/Models/MediaMapper.php @@ -43,7 +43,7 @@ class MediaMapper extends DataMapperAbstract /** * Primary table. * - * @var \string + * @var string * @since 1.0.0 */ protected static $table = 'media'; @@ -53,7 +53,7 @@ class MediaMapper extends DataMapperAbstract /** * Primary field name. * - * @var \string + * @var string * @since 1.0.0 */ protected static $primaryField = 'media_id'; @@ -63,7 +63,7 @@ class MediaMapper extends DataMapperAbstract * * @param Media $obj Media * - * @return \bool + * @return bool * * @since 1.0.0 * @author Dennis Eichhorn diff --git a/Models/UploadFile.php b/Models/UploadFile.php index f2f64e0..6e25105 100644 --- a/Models/UploadFile.php +++ b/Models/UploadFile.php @@ -33,7 +33,7 @@ class UploadFile /** * Upload max size. * - * @var \int + * @var int * @since 1.0.0 */ private $maxSize = 50000000; @@ -49,7 +49,7 @@ class UploadFile /** * Output directory. * - * @var \string + * @var string * @since 1.0.0 */ private $outputDir = '/Modules/Media/Files'; @@ -57,7 +57,7 @@ class UploadFile /** * Output file name. * - * @var \string + * @var string * @since 1.0.0 */ private $fileName = ''; @@ -65,7 +65,7 @@ class UploadFile /** * Output file name. * - * @var \bool + * @var bool * @since 1.0.0 */ private $preserveFileName = true; @@ -193,25 +193,25 @@ class UploadFile } /** - * @return \int + * @return int * * @since 1.0.0 * @author Dennis Eichhorn */ - public function getMaxSize() : \int + public function getMaxSize() : int { return $this->maxSize; } /** - * @param \int $maxSize + * @param int $maxSize * * @return void * * @since 1.0.0 * @author Dennis Eichhorn */ - public function setMaxSize(\int $maxSize) + public function setMaxSize(int $maxSize) { $this->maxSize = $maxSize; } @@ -254,62 +254,62 @@ class UploadFile } /** - * @return \string + * @return string * * @since 1.0.0 * @author Dennis Eichhorn */ - public function getOutputDir() : \string + public function getOutputDir() : string { return $this->outputDir; } /** - * @param \string $outputDir + * @param string $outputDir * * @return void * * @since 1.0.0 * @author Dennis Eichhorn */ - public function setOutputDir(\string $outputDir) + public function setOutputDir(string $outputDir) { $this->outputDir = $outputDir; } /** - * @return \string + * @return string * * @since 1.0.0 * @author Dennis Eichhorn */ - public function getFileName() : \string + public function getFileName() : string { return $this->fileName; } /** - * @param \string $fileName + * @param string $fileName * * @return void * * @since 1.0.0 * @author Dennis Eichhorn */ - public function setFileName(\string $fileName) + public function setFileName(string $fileName) { $this->fileName = $fileName; } /** - * @param \bool $preserveFileName + * @param bool $preserveFileName * * @return void * * @since 1.0.0 * @author Dennis Eichhorn */ - public function setPreserveFileName(\bool $preserveFileName) + public function setPreserveFileName(bool $preserveFileName) { $this->preserveFileName = $preserveFileName; }