Fixing deprecation in PHP 8.5 (#86)

* Fixing deprecation in PHP 8.5

* Removed ancient code sniffer.

* Skip DNS resoultion failure.

Author: kamilwylegala

composer.json

@@ -29,8 +29,7 @@
 		"ext-intl": "Required to use IntlDateFormatter instead of strftime, if not Symfony polyfill will be used."
 	},
 	"require-dev": {
-		"phpunit/phpunit": "^9.5",
-		"cakephp/cakephp-codesniffer": "^1.0.0"
+		"phpunit/phpunit": "^9.5"
 	},
 	"config": {
 		"vendor-dir": "vendors/",
@@ -41,10 +40,8 @@
 	],
 	"scripts": {
 		"check": [
-			"@cs-check",
 			"@test"
 		],
-		"cs-check": "./vendors/bin/phpcs -p --extensions=php --standard=CakePHP ./lib/Cake",
 		"test": "./lib/Cake/Console/cake test core AllTests --stderr --verbose"
 	}
 }

lib/Cake/Model/Datasource/Database/Mysql.php

@@ -161,14 +161,23 @@ public function connect() {
 		$config = $this->config;
 		$this->connected = false;
 
+		// PDO::MYSQL_ATTR_* constants are deprecated in PHP 8.5; Pdo\Mysql class is available since PHP 8.1
+		if (class_exists('Pdo\Mysql')) {
+			$mysqlAttrUseBufferedQuery = Pdo\Mysql::ATTR_USE_BUFFERED_QUERY;
+			$mysqlAttrInitCommand = Pdo\Mysql::ATTR_INIT_COMMAND;
+		} else {
+			$mysqlAttrUseBufferedQuery = PDO::MYSQL_ATTR_USE_BUFFERED_QUERY;
+			$mysqlAttrInitCommand = PDO::MYSQL_ATTR_INIT_COMMAND;
+		}
+
 		$flags = $config['flags'] + array(
 			PDO::ATTR_PERSISTENT => $config['persistent'],
-			PDO::MYSQL_ATTR_USE_BUFFERED_QUERY => true,
+			$mysqlAttrUseBufferedQuery => true,
 			PDO::ATTR_ERRMODE => PDO::ERRMODE_EXCEPTION
 		);
 
 		if (!empty($config['encoding'])) {
-			$flags[PDO::MYSQL_ATTR_INIT_COMMAND] = 'SET NAMES ' . $config['encoding'];
+			$flags[$mysqlAttrInitCommand] = 'SET NAMES ' . $config['encoding'];
 		}
 		if (!empty($config['ssl_key']) && !empty($config['ssl_cert'])) {
 			$flags[PDO::MYSQL_ATTR_SSL_KEY] = $config['ssl_key'];

lib/Cake/Test/Case/Network/Http/HttpSocketTest.php

@@ -1845,6 +1845,7 @@ public function testVerifyPeer() {
 		} catch (SocketException $e) {
 			$message = $e->getMessage();
 			$this->skipIf(strpos($message, 'Invalid HTTP') !== false, 'Invalid HTTP Response received, skipping.');
+			$this->skipIf(strpos($message, 'getaddrinfo') !== false, 'Could not resolve host, network unavailable, skipping.');
 			$this->assertStringContainsString('Failed to enable crypto', $message);
 		}
 	}