From 8529fba8aa8e044acb6cf7899d793e3a793dcde1 Mon Sep 17 00:00:00 2001
From: Cristiano Magro <cristiano.magro@vola.it>
Date: Tue, 27 Aug 2019 11:20:37 +0200
Subject: [PATCH] Format code and some comment
---
tests/SetupUploadTest.php | 45 +++++++++-----
src/Vola/UploadFile/SetupUpload.class.php | 91 ++++++++++++++++++++----------
2 files changed, 90 insertions(+), 46 deletions(-)
diff --git a/src/Vola/UploadFile/SetupUpload.class.php b/src/Vola/UploadFile/SetupUpload.class.php
index 9193095..12a7ab3 100644
--- a/src/Vola/UploadFile/SetupUpload.class.php
+++ b/src/Vola/UploadFile/SetupUpload.class.php
@@ -9,7 +9,8 @@
*
* @author Cristiano Magro
*/
-class SetupUpload {
+class SetupUpload
+{
private $queueLimitUpload;
private $totLimitUpload;
@@ -28,30 +29,36 @@
*
* @return \SetupUpload
*/
- public static function create() {
+ public static function create()
+ {
$instance = new self;
return $instance;
}
- public function getQueueLimit() {
+ public function getQueueLimit()
+ {
return $this->queueLimitUpload;
}
- public function setQueueLimit($x) {
+ public function setQueueLimit($x)
+ {
$this->queueLimitUpload = $x;
return $this;
}
- public function getTotalLimit() {
+ public function getTotalLimit()
+ {
return $this->totLimitUpload;
}
- public function setTotalLimit($x) {
+ public function setTotalLimit($x)
+ {
$this->totLimitUpload = $x;
return $this;
}
- public function getSizeLimitFile() {
+ public function getSizeLimitFile()
+ {
return $this->sizeLimitFileUpload;
}
@@ -65,39 +72,47 @@
*
* @return \SetupUpload
*/
- public function setSizeLimitFile($x) {
+ public function setSizeLimitFile($x)
+ {
$this->sizeLimitFileUpload = self::str2Bytes($x);
return $this;
}
- public function getLimitText() {
+ public function getLimitText()
+ {
return $this->totLimitUploadTest;
}
- public function setLimitText($x) {
+ public function setLimitText($x)
+ {
$this->totLimitUploadTest = $x;
return $this;
}
- public function getFilesFilter() {
+ public function getFilesFilter()
+ {
return $this->fileFilterExt;
}
- public function setFilesFilter($x) {
+ public function setFilesFilter($x)
+ {
$this->fileFilterExt = $x;
return $this;
}
- public function getRandomValue() {
+ public function getRandomValue()
+ {
return $this->random;
}
- public function setRandomValue($x) {
+ public function setRandomValue($x)
+ {
$this->random = $x;
return $this;
}
- public function getPathUploadKey() {
+ public function getPathUploadKey()
+ {
return $this->pathUploadKey;
}
@@ -112,7 +127,8 @@
*
* @return \SetupUpload
*/
- public function setPathUploadKey($pathKey) {
+ public function setPathUploadKey($pathKey)
+ {
$this->pathUploadKey = $pathKey;
return $this;
}
@@ -122,7 +138,8 @@
*
* @return integer Max numero file
*/
- public function getNumMaxFiles() {
+ public function getNumMaxFiles()
+ {
return $this->numMaxFiles;
}
@@ -130,10 +147,10 @@
* Viene impostato il numero massimo di file caricabili
*
* @param integer $numero limite massimo file caricabili
- *
* @return \SetupUpload fluent style
*/
- public function setNumMaxFiles($numero) {
+ public function setNumMaxFiles($numero)
+ {
if (!is_integer($numero) || $numero <= 0) {
throw new Upload_Exc_Error();
}
@@ -142,7 +159,8 @@
return $this;
}
- public function getSizeMaxFilesByte() {
+ public function getSizeMaxFilesByte()
+ {
return $this->sizeMaxFilesByte;
}
@@ -156,26 +174,39 @@
*
* @return \SetupUpload
*/
- public function setSizeMaxFilesByte($x) {
+ public function setSizeMaxFilesByte($x)
+ {
$this->sizeMaxFilesByte = self::str2Bytes($x);
return $this;
}
- public function getSizeMaxFilesDesc() {
+ public function getSizeMaxFilesDesc()
+ {
return $this->sizeMaxFilesDesc;
}
- public function setSizeMaxFilesDesc($x) {
+ public function setSizeMaxFilesDesc($x)
+ {
$this->sizeMaxFilesDesc = $x;
return $this;
}
- public function getDebugActive() {
+
+ /**
+ * @return bool
+ */
+ public function getDebugActive()
+ {
return $this->debugPageActive;
}
- public function setDebugActive($x) {
- $this->debugPageActive = $x;
+ /**
+ * @param bool $value
+ * @return $this
+ */
+ public function setDebugActive($value)
+ {
+ $this->debugPageActive = $value;
return $this;
}
@@ -188,7 +219,8 @@
*
* @return string json
*/
- public function createJsonSetup() {
+ public function createJsonSetup()
+ {
$dati = array(
'QUEUE_LIMIT_UPLOAD' => $this->getQueueLimit(),
'TOT_LIMIT_UPLOAD' => $this->getSizeMaxFilesByte(),
@@ -206,12 +238,11 @@
* 1 Mb = 1024^2
*
* @param string $strSize Stringa da convertire
- *
* @throws UploadFile_Excs
- *
* @return integer
*/
- public static function str2Bytes($strSize) {
+ public static function str2Bytes($strSize)
+ {
$Units = array('b' => 0, 'kb' => 1, 'mb' => 2, 'gb' => 3, 'tb' => 4);
$strUnit = strtolower($strSize);
diff --git a/tests/SetupUploadTest.php b/tests/SetupUploadTest.php
index 930681e..a0ac041 100644
--- a/tests/SetupUploadTest.php
+++ b/tests/SetupUploadTest.php
@@ -1,16 +1,16 @@
<?php
-
/**
* Implementazione dei test per la classe SetupUpload
*
* @author Cristiano Magro
*/
-class SetupUploadTest extends PHPUnit_Framework_TestCase {
+class SetupUploadTest extends PHPUnit_Framework_TestCase
+{
/**
- * @var $object SetupUpload
+ * @var $object SetupUpload
*/
protected $object;
@@ -18,7 +18,8 @@
* Set up fixture, inizializzazione dei test.
* Eseguito prima di ogni test
*/
- protected function setUp() {
+ protected function setUp()
+ {
$this->object = SetupUpload::create();
}
@@ -26,11 +27,13 @@
* Tears down the fixture, for example, closes a network connection.
* This method is called after a test is executed.
*/
- protected function tearDown() {
+ protected function tearDown()
+ {
}
- public static function setUpBeforeClass() {
+ public static function setUpBeforeClass()
+ {
}
@@ -39,7 +42,8 @@
*
* @since 0.3.0
*/
- public function test_str2Bytes() {
+ public function test_str2Bytes()
+ {
$this->assertEquals('1', SetupUpload::str2Bytes('1'));
$this->assertEquals('1', SetupUpload::str2Bytes('1b'));
@@ -71,11 +75,13 @@
* @expectedException Upload_Exc_Error
* @dataProvider getBytesStringNotValid
*/
- public function test_str2BytesNonValido($byteString) {
+ public function test_str2BytesNonValido($byteString)
+ {
SetupUpload::str2Bytes($byteString);
}
- public function getBytesStringNotValid() {
+ public function getBytesStringNotValid()
+ {
return array(
array(''),
array('b'),
@@ -89,7 +95,8 @@
*
* @since 0.3.1
*/
- public function testDefaultValue() {
+ public function testDefaultValue()
+ {
$this->assertEquals(1, $this->object->getNumMaxFiles());
}
@@ -100,11 +107,13 @@
* @expectedException Upload_Exc_Error
* @dataProvider getNumMaxFilesException
*/
- public function testNotValidNumMaxFilesGetException($num) {
+ public function testNotValidNumMaxFilesGetException($num)
+ {
$this->object->setNumMaxFiles($num);
}
- public function getNumMaxFilesException() {
+ public function getNumMaxFilesException()
+ {
return array(
array(''),
array(0),
@@ -119,12 +128,14 @@
* @since 0.3.1
* @dataProvider getSomeMaxFiles
*/
- public function testSomeValidMaxFiles($num) {
+ public function testSomeValidMaxFiles($num)
+ {
$this->object->setNumMaxFiles($num);
$this->assertEquals($num, $this->object->getNumMaxFiles());
}
- public function getSomeMaxFiles() {
+ public function getSomeMaxFiles()
+ {
return array(
array(2),
array(020),
@@ -138,7 +149,8 @@
*
* @since 0.3.1
*/
- public function testSetSizeMaxFilesByte() {
+ public function testSetSizeMaxFilesByte()
+ {
$this->object->setSizeMaxFilesByte(100);
$this->assertEquals(100, $this->object->getSizeMaxFilesByte());
@@ -154,7 +166,8 @@
*
* @since 0.3.1
*/
- public function testSetSizeLimitFile() {
+ public function testSetSizeLimitFile()
+ {
$this->object->setSizeLimitFile(100);
$this->assertEquals(100, $this->object->getSizeLimitFile());
--
Gitblit v1.8.0