Passed
Push — master ( 61a02b...010b07 )
by Roeland
19:08 queued 08:59
created
lib/private/Memcache/APCu.php 1 patch
Indentation   +125 added lines, -125 removed lines patch added patch discarded remove patch
@@ -30,140 +30,140 @@
 block discarded – undo
30 30
 use OCP\IMemcache;
31 31
 
32 32
 class APCu extends Cache implements IMemcache {
33
-	use CASTrait {
34
-		cas as casEmulated;
35
-	}
33
+    use CASTrait {
34
+        cas as casEmulated;
35
+    }
36 36
 
37
-	use CADTrait;
37
+    use CADTrait;
38 38
 
39
-	public function get($key) {
40
-		$result = apcu_fetch($this->getPrefix() . $key, $success);
41
-		if (!$success) {
42
-			return null;
43
-		}
44
-		return $result;
45
-	}
39
+    public function get($key) {
40
+        $result = apcu_fetch($this->getPrefix() . $key, $success);
41
+        if (!$success) {
42
+            return null;
43
+        }
44
+        return $result;
45
+    }
46 46
 
47
-	public function set($key, $value, $ttl = 0) {
48
-		return apcu_store($this->getPrefix() . $key, $value, $ttl);
49
-	}
47
+    public function set($key, $value, $ttl = 0) {
48
+        return apcu_store($this->getPrefix() . $key, $value, $ttl);
49
+    }
50 50
 
51
-	public function hasKey($key) {
52
-		return apcu_exists($this->getPrefix() . $key);
53
-	}
51
+    public function hasKey($key) {
52
+        return apcu_exists($this->getPrefix() . $key);
53
+    }
54 54
 
55
-	public function remove($key) {
56
-		return apcu_delete($this->getPrefix() . $key);
57
-	}
55
+    public function remove($key) {
56
+        return apcu_delete($this->getPrefix() . $key);
57
+    }
58 58
 
59
-	public function clear($prefix = '') {
60
-		$ns = $this->getPrefix() . $prefix;
61
-		$ns = preg_quote($ns, '/');
62
-		if(class_exists('\APCIterator')) {
63
-			$iter = new \APCIterator('user', '/^' . $ns . '/', APC_ITER_KEY);
64
-		} else {
65
-			$iter = new \APCUIterator('/^' . $ns . '/', APC_ITER_KEY);
66
-		}
67
-		return apcu_delete($iter);
68
-	}
59
+    public function clear($prefix = '') {
60
+        $ns = $this->getPrefix() . $prefix;
61
+        $ns = preg_quote($ns, '/');
62
+        if(class_exists('\APCIterator')) {
63
+            $iter = new \APCIterator('user', '/^' . $ns . '/', APC_ITER_KEY);
64
+        } else {
65
+            $iter = new \APCUIterator('/^' . $ns . '/', APC_ITER_KEY);
66
+        }
67
+        return apcu_delete($iter);
68
+    }
69 69
 
70
-	/**
71
-	 * Set a value in the cache if it's not already stored
72
-	 *
73
-	 * @param string $key
74
-	 * @param mixed $value
75
-	 * @param int $ttl Time To Live in seconds. Defaults to 60*60*24
76
-	 * @return bool
77
-	 */
78
-	public function add($key, $value, $ttl = 0) {
79
-		return apcu_add($this->getPrefix() . $key, $value, $ttl);
80
-	}
70
+    /**
71
+     * Set a value in the cache if it's not already stored
72
+     *
73
+     * @param string $key
74
+     * @param mixed $value
75
+     * @param int $ttl Time To Live in seconds. Defaults to 60*60*24
76
+     * @return bool
77
+     */
78
+    public function add($key, $value, $ttl = 0) {
79
+        return apcu_add($this->getPrefix() . $key, $value, $ttl);
80
+    }
81 81
 
82
-	/**
83
-	 * Increase a stored number
84
-	 *
85
-	 * @param string $key
86
-	 * @param int $step
87
-	 * @return int | bool
88
-	 */
89
-	public function inc($key, $step = 1) {
90
-		$this->add($key, 0);
91
-		/**
92
-		 * TODO - hack around a PHP 7 specific issue in APCu
93
-		 *
94
-		 * on PHP 7 the apcu_inc method on a non-existing object will increment
95
-		 * "0" and result in "1" as value - therefore we check for existence
96
-		 * first
97
-		 *
98
-		 * on PHP 5.6 this is not the case
99
-		 *
100
-		 * see https://github.com/krakjoe/apcu/issues/183#issuecomment-244038221
101
-		 * for details
102
-		 */
103
-		return apcu_exists($this->getPrefix() . $key)
104
-			? apcu_inc($this->getPrefix() . $key, $step)
105
-			: false;
106
-	}
82
+    /**
83
+     * Increase a stored number
84
+     *
85
+     * @param string $key
86
+     * @param int $step
87
+     * @return int | bool
88
+     */
89
+    public function inc($key, $step = 1) {
90
+        $this->add($key, 0);
91
+        /**
92
+         * TODO - hack around a PHP 7 specific issue in APCu
93
+         *
94
+         * on PHP 7 the apcu_inc method on a non-existing object will increment
95
+         * "0" and result in "1" as value - therefore we check for existence
96
+         * first
97
+         *
98
+         * on PHP 5.6 this is not the case
99
+         *
100
+         * see https://github.com/krakjoe/apcu/issues/183#issuecomment-244038221
101
+         * for details
102
+         */
103
+        return apcu_exists($this->getPrefix() . $key)
104
+            ? apcu_inc($this->getPrefix() . $key, $step)
105
+            : false;
106
+    }
107 107
 
108
-	/**
109
-	 * Decrease a stored number
110
-	 *
111
-	 * @param string $key
112
-	 * @param int $step
113
-	 * @return int | bool
114
-	 */
115
-	public function dec($key, $step = 1) {
116
-		/**
117
-		 * TODO - hack around a PHP 7 specific issue in APCu
118
-		 *
119
-		 * on PHP 7 the apcu_dec method on a non-existing object will decrement
120
-		 * "0" and result in "-1" as value - therefore we check for existence
121
-		 * first
122
-		 *
123
-		 * on PHP 5.6 this is not the case
124
-		 *
125
-		 * see https://github.com/krakjoe/apcu/issues/183#issuecomment-244038221
126
-		 * for details
127
-		 */
128
-		return apcu_exists($this->getPrefix() . $key)
129
-			? apcu_dec($this->getPrefix() . $key, $step)
130
-			: false;
131
-	}
108
+    /**
109
+     * Decrease a stored number
110
+     *
111
+     * @param string $key
112
+     * @param int $step
113
+     * @return int | bool
114
+     */
115
+    public function dec($key, $step = 1) {
116
+        /**
117
+         * TODO - hack around a PHP 7 specific issue in APCu
118
+         *
119
+         * on PHP 7 the apcu_dec method on a non-existing object will decrement
120
+         * "0" and result in "-1" as value - therefore we check for existence
121
+         * first
122
+         *
123
+         * on PHP 5.6 this is not the case
124
+         *
125
+         * see https://github.com/krakjoe/apcu/issues/183#issuecomment-244038221
126
+         * for details
127
+         */
128
+        return apcu_exists($this->getPrefix() . $key)
129
+            ? apcu_dec($this->getPrefix() . $key, $step)
130
+            : false;
131
+    }
132 132
 
133
-	/**
134
-	 * Compare and set
135
-	 *
136
-	 * @param string $key
137
-	 * @param mixed $old
138
-	 * @param mixed $new
139
-	 * @return bool
140
-	 */
141
-	public function cas($key, $old, $new) {
142
-		// apc only does cas for ints
143
-		if (is_int($old) and is_int($new)) {
144
-			return apcu_cas($this->getPrefix() . $key, $old, $new);
145
-		} else {
146
-			return $this->casEmulated($key, $old, $new);
147
-		}
148
-	}
133
+    /**
134
+     * Compare and set
135
+     *
136
+     * @param string $key
137
+     * @param mixed $old
138
+     * @param mixed $new
139
+     * @return bool
140
+     */
141
+    public function cas($key, $old, $new) {
142
+        // apc only does cas for ints
143
+        if (is_int($old) and is_int($new)) {
144
+            return apcu_cas($this->getPrefix() . $key, $old, $new);
145
+        } else {
146
+            return $this->casEmulated($key, $old, $new);
147
+        }
148
+    }
149 149
 
150
-	/**
151
-	 * @return bool
152
-	 */
153
-	static public function isAvailable() {
154
-		if (!extension_loaded('apcu')) {
155
-			return false;
156
-		} elseif (!\OC::$server->getIniWrapper()->getBool('apc.enabled')) {
157
-			return false;
158
-		} elseif (!\OC::$server->getIniWrapper()->getBool('apc.enable_cli') && \OC::$CLI) {
159
-			return false;
160
-		} elseif (
161
-				version_compare(phpversion('apc') ?: '0.0.0', '4.0.6') === -1 &&
162
-				version_compare(phpversion('apcu') ?: '0.0.0', '5.1.0') === -1
163
-		) {
164
-			return false;
165
-		} else {
166
-			return true;
167
-		}
168
-	}
150
+    /**
151
+     * @return bool
152
+     */
153
+    static public function isAvailable() {
154
+        if (!extension_loaded('apcu')) {
155
+            return false;
156
+        } elseif (!\OC::$server->getIniWrapper()->getBool('apc.enabled')) {
157
+            return false;
158
+        } elseif (!\OC::$server->getIniWrapper()->getBool('apc.enable_cli') && \OC::$CLI) {
159
+            return false;
160
+        } elseif (
161
+                version_compare(phpversion('apc') ?: '0.0.0', '4.0.6') === -1 &&
162
+                version_compare(phpversion('apcu') ?: '0.0.0', '5.1.0') === -1
163
+        ) {
164
+            return false;
165
+        } else {
166
+            return true;
167
+        }
168
+    }
169 169
 }
Please login to merge, or discard this patch.
lib/private/App/CodeChecker/DatabaseSchemaChecker.php 1 patch
Indentation   +77 added lines, -77 removed lines patch added patch discarded remove patch
@@ -25,81 +25,81 @@
 block discarded – undo
25 25
 
26 26
 class DatabaseSchemaChecker {
27 27
 
28
-	/**
29
-	 * @param string $appId
30
-	 * @return array
31
-	 */
32
-	public function analyse($appId) {
33
-		$appPath = \OC_App::getAppPath($appId);
34
-		if ($appPath === false) {
35
-			throw new \RuntimeException("No app with given id <$appId> known.");
36
-		}
37
-
38
-		if (!file_exists($appPath . '/appinfo/database.xml')) {
39
-			return ['errors' => [], 'warnings' => []];
40
-		}
41
-
42
-		libxml_use_internal_errors(true);
43
-		$loadEntities = libxml_disable_entity_loader(false);
44
-		$xml = simplexml_load_file($appPath . '/appinfo/database.xml');
45
-		libxml_disable_entity_loader($loadEntities);
46
-
47
-
48
-		$errors = $warnings = [];
49
-
50
-		foreach ($xml->table as $table) {
51
-			// Table names
52
-			if (strpos((string)$table->name, '*dbprefix*') !== 0) {
53
-				$errors[] = 'Database schema error: name of table ' . (string)$table->name . ' does not start with *dbprefix*';
54
-			}
55
-			$tableName = substr((string)$table->name, strlen('*dbprefix*'));
56
-			if (strpos($tableName, '*dbprefix*') !== false) {
57
-				$warnings[] = 'Database schema warning: *dbprefix* should only appear once in name of table ' . (string)$table->name;
58
-			}
59
-
60
-			if (strlen($tableName) > 27) {
61
-				$errors[] = 'Database schema error: Name of table ' . (string)$table->name . ' is too long (' . strlen($tableName) . '), max. 27 characters (21 characters for tables with autoincrement) + *dbprefix* allowed';
62
-			}
63
-
64
-			$hasAutoIncrement = false;
65
-
66
-			// Column names
67
-			foreach ($table->declaration->field as $column) {
68
-				if (strpos((string)$column->name, '*dbprefix*') !== false) {
69
-					$warnings[] = 'Database schema warning: *dbprefix* should not appear in name of column ' . (string)$column->name . ' on table ' . (string)$table->name;
70
-				}
71
-
72
-				if (strlen((string)$column->name) > 30) {
73
-					$errors[] = 'Database schema error: Name of column ' . (string)$column->name . ' on table ' . (string)$table->name . ' is too long (' . strlen($tableName) . '), max. 30 characters allowed';
74
-				}
75
-
76
-				if ($column->autoincrement) {
77
-					if ($hasAutoIncrement) {
78
-						$errors[] = 'Database schema error: Table ' . (string)$table->name . ' has multiple autoincrement columns';
79
-					}
80
-
81
-					if (strlen($tableName) > 21) {
82
-						$errors[] = 'Database schema error: Name of table ' . (string)$table->name . ' is too long (' . strlen($tableName) . '), max. 27 characters (21 characters for tables with autoincrement) + *dbprefix* allowed';
83
-					}
84
-
85
-					$hasAutoIncrement = true;
86
-				}
87
-			}
88
-
89
-			// Index names
90
-			foreach ($table->declaration->index as $index) {
91
-				$hasPrefix = strpos((string)$index->name, '*dbprefix*');
92
-				if ($hasPrefix !== false && $hasPrefix !== 0) {
93
-					$warnings[] = 'Database schema warning: *dbprefix* should only appear at the beginning in name of index ' . (string)$index->name . ' on table ' . (string)$table->name;
94
-				}
95
-
96
-				$indexName = $hasPrefix === 0 ? substr((string)$index->name, strlen('*dbprefix*')) : (string)$index->name;
97
-				if (strlen($indexName) > 27) {
98
-					$errors[] = 'Database schema error: Name of index ' . (string)$index->name . ' on table ' . (string)$table->name . ' is too long (' . strlen($tableName) . '), max. 27 characters + *dbprefix* allowed';
99
-				}
100
-			}
101
-		}
102
-
103
-		return ['errors' => $errors, 'warnings' => $warnings];
104
-	}
28
+    /**
29
+     * @param string $appId
30
+     * @return array
31
+     */
32
+    public function analyse($appId) {
33
+        $appPath = \OC_App::getAppPath($appId);
34
+        if ($appPath === false) {
35
+            throw new \RuntimeException("No app with given id <$appId> known.");
36
+        }
37
+
38
+        if (!file_exists($appPath . '/appinfo/database.xml')) {
39
+            return ['errors' => [], 'warnings' => []];
40
+        }
41
+
42
+        libxml_use_internal_errors(true);
43
+        $loadEntities = libxml_disable_entity_loader(false);
44
+        $xml = simplexml_load_file($appPath . '/appinfo/database.xml');
45
+        libxml_disable_entity_loader($loadEntities);
46
+
47
+
48
+        $errors = $warnings = [];
49
+
50
+        foreach ($xml->table as $table) {
51
+            // Table names
52
+            if (strpos((string)$table->name, '*dbprefix*') !== 0) {
53
+                $errors[] = 'Database schema error: name of table ' . (string)$table->name . ' does not start with *dbprefix*';
54
+            }
55
+            $tableName = substr((string)$table->name, strlen('*dbprefix*'));
56
+            if (strpos($tableName, '*dbprefix*') !== false) {
57
+                $warnings[] = 'Database schema warning: *dbprefix* should only appear once in name of table ' . (string)$table->name;
58
+            }
59
+
60
+            if (strlen($tableName) > 27) {
61
+                $errors[] = 'Database schema error: Name of table ' . (string)$table->name . ' is too long (' . strlen($tableName) . '), max. 27 characters (21 characters for tables with autoincrement) + *dbprefix* allowed';
62
+            }
63
+
64
+            $hasAutoIncrement = false;
65
+
66
+            // Column names
67
+            foreach ($table->declaration->field as $column) {
68
+                if (strpos((string)$column->name, '*dbprefix*') !== false) {
69
+                    $warnings[] = 'Database schema warning: *dbprefix* should not appear in name of column ' . (string)$column->name . ' on table ' . (string)$table->name;
70
+                }
71
+
72
+                if (strlen((string)$column->name) > 30) {
73
+                    $errors[] = 'Database schema error: Name of column ' . (string)$column->name . ' on table ' . (string)$table->name . ' is too long (' . strlen($tableName) . '), max. 30 characters allowed';
74
+                }
75
+
76
+                if ($column->autoincrement) {
77
+                    if ($hasAutoIncrement) {
78
+                        $errors[] = 'Database schema error: Table ' . (string)$table->name . ' has multiple autoincrement columns';
79
+                    }
80
+
81
+                    if (strlen($tableName) > 21) {
82
+                        $errors[] = 'Database schema error: Name of table ' . (string)$table->name . ' is too long (' . strlen($tableName) . '), max. 27 characters (21 characters for tables with autoincrement) + *dbprefix* allowed';
83
+                    }
84
+
85
+                    $hasAutoIncrement = true;
86
+                }
87
+            }
88
+
89
+            // Index names
90
+            foreach ($table->declaration->index as $index) {
91
+                $hasPrefix = strpos((string)$index->name, '*dbprefix*');
92
+                if ($hasPrefix !== false && $hasPrefix !== 0) {
93
+                    $warnings[] = 'Database schema warning: *dbprefix* should only appear at the beginning in name of index ' . (string)$index->name . ' on table ' . (string)$table->name;
94
+                }
95
+
96
+                $indexName = $hasPrefix === 0 ? substr((string)$index->name, strlen('*dbprefix*')) : (string)$index->name;
97
+                if (strlen($indexName) > 27) {
98
+                    $errors[] = 'Database schema error: Name of index ' . (string)$index->name . ' on table ' . (string)$table->name . ' is too long (' . strlen($tableName) . '), max. 27 characters + *dbprefix* allowed';
99
+                }
100
+            }
101
+        }
102
+
103
+        return ['errors' => $errors, 'warnings' => $warnings];
104
+    }
105 105
 }
Please login to merge, or discard this patch.
core/Command/Maintenance/UpdateHtaccess.php 1 patch
Indentation   +14 added lines, -14 removed lines patch added patch discarded remove patch
@@ -32,19 +32,19 @@
 block discarded – undo
32 32
 
33 33
 class UpdateHtaccess extends Command {
34 34
 
35
-	protected function configure() {
36
-		$this
37
-			->setName('maintenance:update:htaccess')
38
-			->setDescription('Updates the .htaccess file');
39
-	}
35
+    protected function configure() {
36
+        $this
37
+            ->setName('maintenance:update:htaccess')
38
+            ->setDescription('Updates the .htaccess file');
39
+    }
40 40
 
41
-	protected function execute(InputInterface $input, OutputInterface $output) {
42
-		if (\OC\Setup::updateHtaccess()) {
43
-			$output->writeln('.htaccess has been updated');
44
-			return 0;
45
-		} else {
46
-			$output->writeln('<error>Error updating .htaccess file, not enough permissions or "overwrite.cli.url" set to an invalid URL?</error>');
47
-			return 1;
48
-		}
49
-	}
41
+    protected function execute(InputInterface $input, OutputInterface $output) {
42
+        if (\OC\Setup::updateHtaccess()) {
43
+            $output->writeln('.htaccess has been updated');
44
+            return 0;
45
+        } else {
46
+            $output->writeln('<error>Error updating .htaccess file, not enough permissions or "overwrite.cli.url" set to an invalid URL?</error>');
47
+            return 1;
48
+        }
49
+    }
50 50
 }
Please login to merge, or discard this patch.
lib/public/IImage.php 1 patch
Indentation   +160 added lines, -160 removed lines patch added patch discarded remove patch
@@ -29,164 +29,164 @@
 block discarded – undo
29 29
  * @since 8.1.0
30 30
  */
31 31
 interface IImage {
32
-	/**
33
-	 * Determine whether the object contains an image resource.
34
-	 *
35
-	 * @return bool
36
-	 * @since 8.1.0
37
-	 */
38
-	public function valid();
39
-
40
-	/**
41
-	 * Returns the MIME type of the image or an empty string if no image is loaded.
42
-	 *
43
-	 * @return string
44
-	 * @since 8.1.0
45
-	 */
46
-	public function mimeType();
47
-
48
-	/**
49
-	 * Returns the width of the image or -1 if no image is loaded.
50
-	 *
51
-	 * @return int
52
-	 * @since 8.1.0
53
-	 */
54
-	public function width();
55
-
56
-	/**
57
-	 * Returns the height of the image or -1 if no image is loaded.
58
-	 *
59
-	 * @return int
60
-	 * @since 8.1.0
61
-	 */
62
-	public function height();
63
-
64
-	/**
65
-	 * Returns the width when the image orientation is top-left.
66
-	 *
67
-	 * @return int
68
-	 * @since 8.1.0
69
-	 */
70
-	public function widthTopLeft();
71
-
72
-	/**
73
-	 * Returns the height when the image orientation is top-left.
74
-	 *
75
-	 * @return int
76
-	 * @since 8.1.0
77
-	 */
78
-	public function heightTopLeft();
79
-
80
-	/**
81
-	 * Outputs the image.
82
-	 *
83
-	 * @param string $mimeType
84
-	 * @return bool
85
-	 * @since 8.1.0
86
-	 */
87
-	public function show($mimeType = null);
88
-
89
-	/**
90
-	 * Saves the image.
91
-	 *
92
-	 * @param string $filePath
93
-	 * @param string $mimeType
94
-	 * @return bool
95
-	 * @since 8.1.0
96
-	 */
97
-	public function save($filePath = null, $mimeType = null);
98
-
99
-	/**
100
-	 * @return resource Returns the image resource in any.
101
-	 * @since 8.1.0
102
-	 */
103
-	public function resource();
104
-
105
-	/**
106
-	 * @return string Returns the raw data mimetype
107
-	 * @since 13.0.0
108
-	 */
109
-	public function dataMimeType();
110
-
111
-	/**
112
-	 * @return string Returns the raw image data.
113
-	 * @since 8.1.0
114
-	 */
115
-	public function data();
116
-
117
-	/**
118
-	 * (I'm open for suggestions on better method name ;)
119
-	 * Get the orientation based on EXIF data.
120
-	 *
121
-	 * @return int The orientation or -1 if no EXIF data is available.
122
-	 * @since 8.1.0
123
-	 */
124
-	public function getOrientation();
125
-
126
-	/**
127
-	 * (I'm open for suggestions on better method name ;)
128
-	 * Fixes orientation based on EXIF data.
129
-	 *
130
-	 * @return bool
131
-	 * @since 8.1.0
132
-	 */
133
-	public function fixOrientation();
134
-
135
-	/**
136
-	 * Resizes the image preserving ratio.
137
-	 *
138
-	 * @param integer $maxSize The maximum size of either the width or height.
139
-	 * @return bool
140
-	 * @since 8.1.0
141
-	 */
142
-	public function resize($maxSize);
143
-
144
-	/**
145
-	 * @param int $width
146
-	 * @param int $height
147
-	 * @return bool
148
-	 * @since 8.1.0
149
-	 */
150
-	public function preciseResize(int $width, int $height): bool;
151
-
152
-	/**
153
-	 * Crops the image to the middle square. If the image is already square it just returns.
154
-	 *
155
-	 * @param int $size maximum size for the result (optional)
156
-	 * @return bool for success or failure
157
-	 * @since 8.1.0
158
-	 */
159
-	public function centerCrop($size = 0);
160
-
161
-	/**
162
-	 * Crops the image from point $x$y with dimension $wx$h.
163
-	 *
164
-	 * @param int $x Horizontal position
165
-	 * @param int $y Vertical position
166
-	 * @param int $w Width
167
-	 * @param int $h Height
168
-	 * @return bool for success or failure
169
-	 * @since 8.1.0
170
-	 */
171
-	public function crop(int $x, int $y, int $w, int $h): bool;
172
-
173
-	/**
174
-	 * Resizes the image to fit within a boundary while preserving ratio.
175
-	 *
176
-	 * @param integer $maxWidth
177
-	 * @param integer $maxHeight
178
-	 * @return bool
179
-	 * @since 8.1.0
180
-	 */
181
-	public function fitIn($maxWidth, $maxHeight);
182
-
183
-	/**
184
-	 * Shrinks the image to fit within a boundary while preserving ratio.
185
-	 *
186
-	 * @param integer $maxWidth
187
-	 * @param integer $maxHeight
188
-	 * @return bool
189
-	 * @since 8.1.0
190
-	 */
191
-	public function scaleDownToFit($maxWidth, $maxHeight);
32
+    /**
33
+     * Determine whether the object contains an image resource.
34
+     *
35
+     * @return bool
36
+     * @since 8.1.0
37
+     */
38
+    public function valid();
39
+
40
+    /**
41
+     * Returns the MIME type of the image or an empty string if no image is loaded.
42
+     *
43
+     * @return string
44
+     * @since 8.1.0
45
+     */
46
+    public function mimeType();
47
+
48
+    /**
49
+     * Returns the width of the image or -1 if no image is loaded.
50
+     *
51
+     * @return int
52
+     * @since 8.1.0
53
+     */
54
+    public function width();
55
+
56
+    /**
57
+     * Returns the height of the image or -1 if no image is loaded.
58
+     *
59
+     * @return int
60
+     * @since 8.1.0
61
+     */
62
+    public function height();
63
+
64
+    /**
65
+     * Returns the width when the image orientation is top-left.
66
+     *
67
+     * @return int
68
+     * @since 8.1.0
69
+     */
70
+    public function widthTopLeft();
71
+
72
+    /**
73
+     * Returns the height when the image orientation is top-left.
74
+     *
75
+     * @return int
76
+     * @since 8.1.0
77
+     */
78
+    public function heightTopLeft();
79
+
80
+    /**
81
+     * Outputs the image.
82
+     *
83
+     * @param string $mimeType
84
+     * @return bool
85
+     * @since 8.1.0
86
+     */
87
+    public function show($mimeType = null);
88
+
89
+    /**
90
+     * Saves the image.
91
+     *
92
+     * @param string $filePath
93
+     * @param string $mimeType
94
+     * @return bool
95
+     * @since 8.1.0
96
+     */
97
+    public function save($filePath = null, $mimeType = null);
98
+
99
+    /**
100
+     * @return resource Returns the image resource in any.
101
+     * @since 8.1.0
102
+     */
103
+    public function resource();
104
+
105
+    /**
106
+     * @return string Returns the raw data mimetype
107
+     * @since 13.0.0
108
+     */
109
+    public function dataMimeType();
110
+
111
+    /**
112
+     * @return string Returns the raw image data.
113
+     * @since 8.1.0
114
+     */
115
+    public function data();
116
+
117
+    /**
118
+     * (I'm open for suggestions on better method name ;)
119
+     * Get the orientation based on EXIF data.
120
+     *
121
+     * @return int The orientation or -1 if no EXIF data is available.
122
+     * @since 8.1.0
123
+     */
124
+    public function getOrientation();
125
+
126
+    /**
127
+     * (I'm open for suggestions on better method name ;)
128
+     * Fixes orientation based on EXIF data.
129
+     *
130
+     * @return bool
131
+     * @since 8.1.0
132
+     */
133
+    public function fixOrientation();
134
+
135
+    /**
136
+     * Resizes the image preserving ratio.
137
+     *
138
+     * @param integer $maxSize The maximum size of either the width or height.
139
+     * @return bool
140
+     * @since 8.1.0
141
+     */
142
+    public function resize($maxSize);
143
+
144
+    /**
145
+     * @param int $width
146
+     * @param int $height
147
+     * @return bool
148
+     * @since 8.1.0
149
+     */
150
+    public function preciseResize(int $width, int $height): bool;
151
+
152
+    /**
153
+     * Crops the image to the middle square. If the image is already square it just returns.
154
+     *
155
+     * @param int $size maximum size for the result (optional)
156
+     * @return bool for success or failure
157
+     * @since 8.1.0
158
+     */
159
+    public function centerCrop($size = 0);
160
+
161
+    /**
162
+     * Crops the image from point $x$y with dimension $wx$h.
163
+     *
164
+     * @param int $x Horizontal position
165
+     * @param int $y Vertical position
166
+     * @param int $w Width
167
+     * @param int $h Height
168
+     * @return bool for success or failure
169
+     * @since 8.1.0
170
+     */
171
+    public function crop(int $x, int $y, int $w, int $h): bool;
172
+
173
+    /**
174
+     * Resizes the image to fit within a boundary while preserving ratio.
175
+     *
176
+     * @param integer $maxWidth
177
+     * @param integer $maxHeight
178
+     * @return bool
179
+     * @since 8.1.0
180
+     */
181
+    public function fitIn($maxWidth, $maxHeight);
182
+
183
+    /**
184
+     * Shrinks the image to fit within a boundary while preserving ratio.
185
+     *
186
+     * @param integer $maxWidth
187
+     * @param integer $maxHeight
188
+     * @return bool
189
+     * @since 8.1.0
190
+     */
191
+    public function scaleDownToFit($maxWidth, $maxHeight);
192 192
 }
Please login to merge, or discard this patch.
lib/public/AppFramework/IAppContainer.php 1 patch
Indentation   +24 added lines, -24 removed lines patch added patch discarded remove patch
@@ -37,31 +37,31 @@
 block discarded – undo
37 37
  */
38 38
 interface IAppContainer extends IContainer {
39 39
 
40
-	/**
41
-	 * used to return the appname of the set application
42
-	 * @return string the name of your application
43
-	 * @since 6.0.0
44
-	 */
45
-	public function getAppName();
40
+    /**
41
+     * used to return the appname of the set application
42
+     * @return string the name of your application
43
+     * @since 6.0.0
44
+     */
45
+    public function getAppName();
46 46
 
47
-	/**
48
-	 * @return \OCP\IServerContainer
49
-	 * @since 6.0.0
50
-	 */
51
-	public function getServer();
47
+    /**
48
+     * @return \OCP\IServerContainer
49
+     * @since 6.0.0
50
+     */
51
+    public function getServer();
52 52
 
53
-	/**
54
-	 * @param string $middleWare
55
-	 * @return boolean
56
-	 * @since 6.0.0
57
-	 */
58
-	public function registerMiddleWare($middleWare);
53
+    /**
54
+     * @param string $middleWare
55
+     * @return boolean
56
+     * @since 6.0.0
57
+     */
58
+    public function registerMiddleWare($middleWare);
59 59
 
60
-	/**
61
-	 * Register a capability
62
-	 *
63
-	 * @param string $serviceName e.g. 'OCA\Files\Capabilities'
64
-	 * @since 8.2.0
65
-	 */
66
-	 public function registerCapability($serviceName);
60
+    /**
61
+     * Register a capability
62
+     *
63
+     * @param string $serviceName e.g. 'OCA\Files\Capabilities'
64
+     * @since 8.2.0
65
+     */
66
+        public function registerCapability($serviceName);
67 67
 }
Please login to merge, or discard this patch.
apps/user_ldap/appinfo/install.php 1 patch
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -25,7 +25,7 @@
 block discarded – undo
25 25
 $config = \OC::$server->getConfig();
26 26
 $state = $config->getSystemValue('ldapIgnoreNamingRules', 'doSet');
27 27
 if($state === 'doSet') {
28
-	\OC::$server->getConfig()->setSystemValue('ldapIgnoreNamingRules', false);
28
+    \OC::$server->getConfig()->setSystemValue('ldapIgnoreNamingRules', false);
29 29
 }
30 30
 
31 31
 $helper = new \OCA\User_LDAP\Helper($config);
Please login to merge, or discard this patch.
lib/public/ISearch.php 1 patch
Indentation   +28 added lines, -28 removed lines patch added patch discarded remove patch
@@ -33,36 +33,36 @@
 block discarded – undo
33 33
  */
34 34
 interface ISearch {
35 35
 
36
-	/**
37
-	 * Search all providers for $query
38
-	 * @param string $query
39
-	 * @param string[] $inApps optionally limit results to the given apps
40
-	 * @param int $page pages start at page 1
41
-	 * @param int $size
42
-	 * @return array An array of OCP\Search\Result's
43
-	 * @since 8.0.0
44
-	 */
45
-	public function searchPaged($query, array $inApps = array(), $page = 1, $size = 30);
36
+    /**
37
+     * Search all providers for $query
38
+     * @param string $query
39
+     * @param string[] $inApps optionally limit results to the given apps
40
+     * @param int $page pages start at page 1
41
+     * @param int $size
42
+     * @return array An array of OCP\Search\Result's
43
+     * @since 8.0.0
44
+     */
45
+    public function searchPaged($query, array $inApps = array(), $page = 1, $size = 30);
46 46
 
47
-	/**
48
-	 * Register a new search provider to search with
49
-	 * @param string $class class name of a OCP\Search\Provider
50
-	 * @param array $options optional
51
-	 * @since 7.0.0
52
-	 */
53
-	public function registerProvider($class, array $options = array());
47
+    /**
48
+     * Register a new search provider to search with
49
+     * @param string $class class name of a OCP\Search\Provider
50
+     * @param array $options optional
51
+     * @since 7.0.0
52
+     */
53
+    public function registerProvider($class, array $options = array());
54 54
 
55
-	/**
56
-	 * Remove one existing search provider
57
-	 * @param string $provider class name of a OCP\Search\Provider
58
-	 * @since 7.0.0
59
-	 */
60
-	public function removeProvider($provider);
55
+    /**
56
+     * Remove one existing search provider
57
+     * @param string $provider class name of a OCP\Search\Provider
58
+     * @since 7.0.0
59
+     */
60
+    public function removeProvider($provider);
61 61
 
62
-	/**
63
-	 * Remove all registered search providers
64
-	 * @since 7.0.0
65
-	 */
66
-	public function clearProviders();
62
+    /**
63
+     * Remove all registered search providers
64
+     * @since 7.0.0
65
+     */
66
+    public function clearProviders();
67 67
 
68 68
 }
Please login to merge, or discard this patch.
lib/private/Search.php 1 patch
Indentation   +76 added lines, -76 removed lines patch added patch discarded remove patch
@@ -34,86 +34,86 @@
 block discarded – undo
34 34
  */
35 35
 class Search implements ISearch {
36 36
 
37
-	private $providers = array();
38
-	private $registeredProviders = array();
37
+    private $providers = array();
38
+    private $registeredProviders = array();
39 39
 
40
-	/**
41
-	 * Search all providers for $query
42
-	 * @param string $query
43
-	 * @param string[] $inApps optionally limit results to the given apps
44
-	 * @param int $page pages start at page 1
45
-	 * @param int $size, 0 = all
46
-	 * @return array An array of OC\Search\Result's
47
-	 */
48
-	public function searchPaged($query, array $inApps = array(), $page = 1, $size = 30) {
49
-		$this->initProviders();
50
-		$results = array();
51
-		foreach($this->providers as $provider) {
52
-			/** @var $provider Provider */
53
-			if ( ! $provider->providesResultsFor($inApps) ) {
54
-				continue;
55
-			}
56
-			if ($provider instanceof PagedProvider) {
57
-				$results = array_merge($results, $provider->searchPaged($query, $page, $size));
58
-			} else if ($provider instanceof Provider) {
59
-				$providerResults = $provider->search($query);
60
-				if ($size > 0) {
61
-					$slicedResults = array_slice($providerResults, ($page - 1) * $size, $size);
62
-					$results = array_merge($results, $slicedResults);
63
-				} else {
64
-					$results = array_merge($results, $providerResults);
65
-				}
66
-			} else {
67
-				\OC::$server->getLogger()->warning('Ignoring Unknown search provider', array('provider' => $provider));
68
-			}
69
-		}
70
-		return $results;
71
-	}
40
+    /**
41
+     * Search all providers for $query
42
+     * @param string $query
43
+     * @param string[] $inApps optionally limit results to the given apps
44
+     * @param int $page pages start at page 1
45
+     * @param int $size, 0 = all
46
+     * @return array An array of OC\Search\Result's
47
+     */
48
+    public function searchPaged($query, array $inApps = array(), $page = 1, $size = 30) {
49
+        $this->initProviders();
50
+        $results = array();
51
+        foreach($this->providers as $provider) {
52
+            /** @var $provider Provider */
53
+            if ( ! $provider->providesResultsFor($inApps) ) {
54
+                continue;
55
+            }
56
+            if ($provider instanceof PagedProvider) {
57
+                $results = array_merge($results, $provider->searchPaged($query, $page, $size));
58
+            } else if ($provider instanceof Provider) {
59
+                $providerResults = $provider->search($query);
60
+                if ($size > 0) {
61
+                    $slicedResults = array_slice($providerResults, ($page - 1) * $size, $size);
62
+                    $results = array_merge($results, $slicedResults);
63
+                } else {
64
+                    $results = array_merge($results, $providerResults);
65
+                }
66
+            } else {
67
+                \OC::$server->getLogger()->warning('Ignoring Unknown search provider', array('provider' => $provider));
68
+            }
69
+        }
70
+        return $results;
71
+    }
72 72
 
73
-	/**
74
-	 * Remove all registered search providers
75
-	 */
76
-	public function clearProviders() {
77
-		$this->providers = array();
78
-		$this->registeredProviders = array();
79
-	}
73
+    /**
74
+     * Remove all registered search providers
75
+     */
76
+    public function clearProviders() {
77
+        $this->providers = array();
78
+        $this->registeredProviders = array();
79
+    }
80 80
 
81
-	/**
82
-	 * Remove one existing search provider
83
-	 * @param string $provider class name of a OC\Search\Provider
84
-	 */
85
-	public function removeProvider($provider) {
86
-		$this->registeredProviders = array_filter(
87
-			$this->registeredProviders,
88
-			function ($element) use ($provider) {
89
-				return ($element['class'] != $provider);
90
-			}
91
-		);
92
-		// force regeneration of providers on next search
93
-		$this->providers = array();
94
-	}
81
+    /**
82
+     * Remove one existing search provider
83
+     * @param string $provider class name of a OC\Search\Provider
84
+     */
85
+    public function removeProvider($provider) {
86
+        $this->registeredProviders = array_filter(
87
+            $this->registeredProviders,
88
+            function ($element) use ($provider) {
89
+                return ($element['class'] != $provider);
90
+            }
91
+        );
92
+        // force regeneration of providers on next search
93
+        $this->providers = array();
94
+    }
95 95
 
96
-	/**
97
-	 * Register a new search provider to search with
98
-	 * @param string $class class name of a OC\Search\Provider
99
-	 * @param array $options optional
100
-	 */
101
-	public function registerProvider($class, array $options = array()) {
102
-		$this->registeredProviders[] = array('class' => $class, 'options' => $options);
103
-	}
96
+    /**
97
+     * Register a new search provider to search with
98
+     * @param string $class class name of a OC\Search\Provider
99
+     * @param array $options optional
100
+     */
101
+    public function registerProvider($class, array $options = array()) {
102
+        $this->registeredProviders[] = array('class' => $class, 'options' => $options);
103
+    }
104 104
 
105
-	/**
106
-	 * Create instances of all the registered search providers
107
-	 */
108
-	private function initProviders() {
109
-		if( ! empty($this->providers) ) {
110
-			return;
111
-		}
112
-		foreach($this->registeredProviders as $provider) {
113
-			$class = $provider['class'];
114
-			$options = $provider['options'];
115
-			$this->providers[] = new $class($options);
116
-		}
117
-	}
105
+    /**
106
+     * Create instances of all the registered search providers
107
+     */
108
+    private function initProviders() {
109
+        if( ! empty($this->providers) ) {
110
+            return;
111
+        }
112
+        foreach($this->registeredProviders as $provider) {
113
+            $class = $provider['class'];
114
+            $options = $provider['options'];
115
+            $this->providers[] = new $class($options);
116
+        }
117
+    }
118 118
 
119 119
 }
Please login to merge, or discard this patch.
lib/private/Security/RateLimiting/Backend/IBackend.php 1 patch
Indentation   +21 added lines, -21 removed lines patch added patch discarded remove patch
@@ -33,26 +33,26 @@
 block discarded – undo
33 33
  * @package OC\Security\RateLimiting\Backend
34 34
  */
35 35
 interface IBackend {
36
-	/**
37
-	 * Gets the amount of attempts within the last specified seconds
38
-	 *
39
-	 * @param string $methodIdentifier Identifier for the method
40
-	 * @param string $userIdentifier Identifier for the user
41
-	 * @param int $seconds Seconds to look back at
42
-	 * @return int
43
-	 */
44
-	public function getAttempts(string $methodIdentifier,
45
-								string $userIdentifier,
46
-								int $seconds): int;
36
+    /**
37
+     * Gets the amount of attempts within the last specified seconds
38
+     *
39
+     * @param string $methodIdentifier Identifier for the method
40
+     * @param string $userIdentifier Identifier for the user
41
+     * @param int $seconds Seconds to look back at
42
+     * @return int
43
+     */
44
+    public function getAttempts(string $methodIdentifier,
45
+                                string $userIdentifier,
46
+                                int $seconds): int;
47 47
 
48
-	/**
49
-	 * Registers an attempt
50
-	 *
51
-	 * @param string $methodIdentifier Identifier for the method
52
-	 * @param string $userIdentifier Identifier for the user
53
-	 * @param int $period Period in seconds how long this attempt should be stored
54
-	 */
55
-	public function registerAttempt(string $methodIdentifier,
56
-									string $userIdentifier,
57
-									int $period);
48
+    /**
49
+     * Registers an attempt
50
+     *
51
+     * @param string $methodIdentifier Identifier for the method
52
+     * @param string $userIdentifier Identifier for the user
53
+     * @param int $period Period in seconds how long this attempt should be stored
54
+     */
55
+    public function registerAttempt(string $methodIdentifier,
56
+                                    string $userIdentifier,
57
+                                    int $period);
58 58
 }
Please login to merge, or discard this patch.