Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/nextcloud/server.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristoph Wurst <christoph@winzerhof-wurst.at>2020-04-10 15:19:56 +0300
committerChristoph Wurst <christoph@winzerhof-wurst.at>2020-04-10 15:19:56 +0300
commitcaff1023ea72bb2ea94130e18a2a6e2ccf819e5f (patch)
tree186d494c2aea5dea7255d3584ef5d595fc6e6194 /tests/lib/Preview
parentedf8ce32cffdb920e8171207b342abbd7f1fbe73 (diff)
Format control structures, classes, methods and function
To continue this formatting madness, here's a tiny patch that adds unified formatting for control structures like if and loops as well as classes, their methods and anonymous functions. This basically forces the constructs to start on the same line. This is not exactly what PSR2 wants, but I think we can have a few exceptions with "our" style. The starting of braces on the same line is pracrically standard for our code. This also removes and empty lines from method/function bodies at the beginning and end. Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
Diffstat (limited to 'tests/lib/Preview')
-rw-r--r--tests/lib/Preview/BackgroundCleanupJobTest.php1
-rw-r--r--tests/lib/Preview/BitmapTest.php2
-rw-r--r--tests/lib/Preview/HEICTest.php3
-rw-r--r--tests/lib/Preview/ImageTest.php2
-rw-r--r--tests/lib/Preview/MP3Test.php2
-rw-r--r--tests/lib/Preview/MovieTest.php2
-rw-r--r--tests/lib/Preview/OfficeTest.php2
-rw-r--r--tests/lib/Preview/SVGTest.php2
-rw-r--r--tests/lib/Preview/TXTTest.php2
9 files changed, 0 insertions, 18 deletions
diff --git a/tests/lib/Preview/BackgroundCleanupJobTest.php b/tests/lib/Preview/BackgroundCleanupJobTest.php
index 5536204dd20..db2bf09b6e5 100644
--- a/tests/lib/Preview/BackgroundCleanupJobTest.php
+++ b/tests/lib/Preview/BackgroundCleanupJobTest.php
@@ -38,7 +38,6 @@ use Test\Traits\UserTrait;
* @package Test\Preview
*/
class BackgroundCleanupJobTest extends \Test\TestCase {
-
use MountProviderTrait;
use UserTrait;
diff --git a/tests/lib/Preview/BitmapTest.php b/tests/lib/Preview/BitmapTest.php
index 952f72b276a..554e499ee84 100644
--- a/tests/lib/Preview/BitmapTest.php
+++ b/tests/lib/Preview/BitmapTest.php
@@ -29,7 +29,6 @@ namespace Test\Preview;
* @package Test\Preview
*/
class BitmapTest extends Provider {
-
protected function setUp(): void {
parent::setUp();
@@ -39,5 +38,4 @@ class BitmapTest extends Provider {
$this->height = 1707;
$this->provider = new \OC\Preview\Postscript;
}
-
}
diff --git a/tests/lib/Preview/HEICTest.php b/tests/lib/Preview/HEICTest.php
index ea937f4df3c..18571dc52ea 100644
--- a/tests/lib/Preview/HEICTest.php
+++ b/tests/lib/Preview/HEICTest.php
@@ -29,7 +29,6 @@ namespace Test\Preview;
* @package Test\Preview
*/
class HEICTest extends Provider {
-
protected function setUp(): void {
if (!in_array("HEIC", \Imagick::queryFormats("HEI*"))) {
$this->markTestSkipped('ImageMagick is not HEIC aware. Skipping tests');
@@ -42,7 +41,5 @@ class HEICTest extends Provider {
$this->height = 1050;
$this->provider = new \OC\Preview\HEIC;
}
-
}
-
}
diff --git a/tests/lib/Preview/ImageTest.php b/tests/lib/Preview/ImageTest.php
index 40267538804..d58e4ca91ba 100644
--- a/tests/lib/Preview/ImageTest.php
+++ b/tests/lib/Preview/ImageTest.php
@@ -29,7 +29,6 @@ namespace Test\Preview;
* @package Test\Preview
*/
class ImageTest extends Provider {
-
protected function setUp(): void {
parent::setUp();
@@ -39,5 +38,4 @@ class ImageTest extends Provider {
$this->height = 1050;
$this->provider = new \OC\Preview\JPEG();
}
-
}
diff --git a/tests/lib/Preview/MP3Test.php b/tests/lib/Preview/MP3Test.php
index 15915ac2578..6e841e29ec4 100644
--- a/tests/lib/Preview/MP3Test.php
+++ b/tests/lib/Preview/MP3Test.php
@@ -29,7 +29,6 @@ namespace Test\Preview;
* @package Test\Preview
*/
class MP3Test extends Provider {
-
protected function setUp(): void {
parent::setUp();
@@ -39,5 +38,4 @@ class MP3Test extends Provider {
$this->height = 200;
$this->provider = new \OC\Preview\MP3;
}
-
}
diff --git a/tests/lib/Preview/MovieTest.php b/tests/lib/Preview/MovieTest.php
index 2415102a83d..767ce130ae4 100644
--- a/tests/lib/Preview/MovieTest.php
+++ b/tests/lib/Preview/MovieTest.php
@@ -29,7 +29,6 @@ namespace Test\Preview;
* @package Test\Preview
*/
class MovieTest extends Provider {
-
protected function setUp(): void {
$avconvBinary = \OC_Helper::findBinaryPath('avconv');
$ffmpegBinary = ($avconvBinary) ? null : \OC_Helper::findBinaryPath('ffmpeg');
@@ -49,5 +48,4 @@ class MovieTest extends Provider {
$this->markTestSkipped('No Movie provider present');
}
}
-
}
diff --git a/tests/lib/Preview/OfficeTest.php b/tests/lib/Preview/OfficeTest.php
index 555b3f77747..c37e5b95a75 100644
--- a/tests/lib/Preview/OfficeTest.php
+++ b/tests/lib/Preview/OfficeTest.php
@@ -29,7 +29,6 @@ namespace Test\Preview;
* @package Test\Preview
*/
class OfficeTest extends Provider {
-
protected function setUp(): void {
$libreofficeBinary = \OC_Helper::findBinaryPath('libreoffice');
$openofficeBinary = ($libreofficeBinary) ? null : \OC_Helper::findBinaryPath('openoffice');
@@ -46,5 +45,4 @@ class OfficeTest extends Provider {
$this->markTestSkipped('No Office provider present');
}
}
-
}
diff --git a/tests/lib/Preview/SVGTest.php b/tests/lib/Preview/SVGTest.php
index 73ccbc0b136..e48018a301b 100644
--- a/tests/lib/Preview/SVGTest.php
+++ b/tests/lib/Preview/SVGTest.php
@@ -29,7 +29,6 @@ namespace Test\Preview;
* @package Test\Preview
*/
class SVGTest extends Provider {
-
protected function setUp(): void {
$checkImagick = new \Imagick();
if (count($checkImagick->queryFormats('SVG')) === 1) {
@@ -44,5 +43,4 @@ class SVGTest extends Provider {
$this->markTestSkipped('No SVG provider present');
}
}
-
}
diff --git a/tests/lib/Preview/TXTTest.php b/tests/lib/Preview/TXTTest.php
index e4c6e76c47f..785fe8c2526 100644
--- a/tests/lib/Preview/TXTTest.php
+++ b/tests/lib/Preview/TXTTest.php
@@ -29,7 +29,6 @@ namespace Test\Preview;
* @package Test\Preview
*/
class TXTTest extends Provider {
-
protected function setUp(): void {
parent::setUp();
@@ -40,5 +39,4 @@ class TXTTest extends Provider {
$this->height = 200;
$this->provider = new \OC\Preview\TXT;
}
-
}