Merge pull request #322 from nextcloud/dependabot/composer/nextcloud/…

…coding-standard-1.2.1 chore(deps-dev): Bump nextcloud/coding-standard from 1.1.1 to 1.2.1
nextcloud · Feb 5, 2024 · f92de5c · f92de5c
2 parents 59924f5 + 72fdf49
commit f92de5c
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 17 deletions.
diff --git a/composer.lock b/composer.lock
diff --git a/lib/DataCollector/EventLoggerDataProvider.php b/lib/DataCollector/EventLoggerDataProvider.php
@@ -19,7 +19,7 @@ public function __construct(IEventLogger $eventLogger) {
 		$this->eventLogger = $eventLogger;
 	}
 
-	public function collect(Request $request, Response $response, \Throwable $exception = null): void {
+	public function collect(Request $request, Response $response, ?\Throwable $exception = null): void {
 		$this->data = [];
 		foreach ($this->eventLogger->getEvents() as $event) {
 			$this->data[$event->getId()] = [

diff --git a/lib/DataCollector/HttpDataCollector.php b/lib/DataCollector/HttpDataCollector.php
@@ -16,7 +16,7 @@ public function getName(): string {
 		return 'http';
 	}
 
-	public function collect(Request $request, Response $response, \Throwable $exception = null): void {
+	public function collect(Request $request, Response $response, ?\Throwable $exception = null): void {
 		try {
 			$content = $request->getParams();
 		} catch (\THrowable $ex) {

diff --git a/lib/DataCollector/MemoryDataCollector.php b/lib/DataCollector/MemoryDataCollector.php
@@ -17,7 +17,7 @@ public function getName(): string {
 		return 'memory';
 	}
 
-	public function collect(Request $request, Response $response, \Throwable $exception = null): void {
+	public function collect(Request $request, Response $response, ?\Throwable $exception = null): void {
 		$this->data = [
 			'memory' => memory_get_peak_usage(true),
 			'memory_limit' => $this->convertToBytes(ini_get('memory_limit')),
@@ -39,7 +39,7 @@ public function getMemoryLimit() {
 	 * @return int|float
 	 */
 	private function convertToBytes(string $memoryLimit) {
-		if ('-1' === $memoryLimit) {
+		if ($memoryLimit === '-1') {
 			return -1;
 		}
 

diff --git a/tests/stubs/oc_core_command_base.php b/tests/stubs/oc_core_command_base.php
@@ -15,7 +15,7 @@ class Base {
 
 		protected string $defaultOutputFormat = self::OUTPUT_FORMAT_PLAIN;
 
-		public function __construct(string $name = null) {
+		public function __construct(?string $name = null) {
 		}
 
 		protected function configure() {