Skip to content

Revert "Fix PHP 8 deprecation notice, remove unused dependencies, remove unrequired aliases" #96

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jinglundong wants to merge 1 commit into
base: master
Choose a base branch
from
+20 −8
Open

Revert "Fix PHP 8 deprecation notice, remove unused dependencies, remove unrequired aliases" #96

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,9 @@
},
"require": {
"php": ">=7.2.0",
"guzzlehttp/guzzle": "^7.2"
"guzzlehttp/streams": "^3.0",
"guzzlehttp/guzzle": "^7.2",
"composer/semver": "^3.2"
},
"require-dev": {
"phpunit/phpunit": "^8",
Expand Down
6 changes: 0 additions & 6 deletions src/Ext/Session/MemcacheSessionHandler.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,6 @@ public function __construct($memcacheContainer = null) {
* @param string $sessionName Not ued
* @return bool true if successful, false otherwise
*/
#[\ReturnTypeWillChange]
public function open($savePath, $sessionName) {
return true;
}
Expand All @@ -72,7 +71,6 @@ public function open($savePath, $sessionName) {
* Closes the session handler.
* @return bool true if successful, false otherwise
*/
#[\ReturnTypeWillChange]
public function close() {
return $this->memcacheContainer->close();
}
Expand All @@ -82,7 +80,6 @@ public function close() {
* @param string $id Session ID associated with the data to be retrieved
* @return string data associated with that ID or empty string on failure
*/
#[\ReturnTypeWillChange]
public function read($id) {
$data = $this->memcacheContainer->get(self::SESSION_PREFIX . $id);
return empty($data) ? '' : $data;
Expand All @@ -94,7 +91,6 @@ public function read($id) {
* @param string $data Data to be stored
* @return bool true if successful, false otherwise
*/
#[\ReturnTypeWillChange]
public function write($id, $data) {
return $this->memcacheContainer->set(
self::SESSION_PREFIX . $id, $data, $this->expire);
Expand All @@ -105,7 +101,6 @@ public function write($id, $data) {
* @param string $id Session ID associated with the data to be destroyed
* @return bool true if successful, false otherwise
*/
#[\ReturnTypeWillChange]
public function destroy($id) {
return $this->memcacheContainer->delete(
self::SESSION_PREFIX . $id);
Expand All @@ -117,7 +112,6 @@ public function destroy($id) {
* @param int $maxlifetime Not used
* @return bool true if successful, false otherwise
*/
#[\ReturnTypeWillChange]
public function gc($maxlifetime) {
// Handled by "expire" in Memcache.
return true;
Expand Down
18 changes: 17 additions & 1 deletion src/aliases.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,4 +21,20 @@
* included in the autoloader inside the composer.json.
*/

@class_alias('Google\AppEngine\Api\AppIdentity\AppIdentityService', 'google\appengine\api\app_identity\AppIdentityService');
$classMap = [
'Google\AppEngine\Api\AppIdentity\AppIdentityService' => 'google\appengine\api\app_identity\AppIdentityService',
'Google\AppEngine\Api\Modules\InvalidModuleStateException' => 'google\appengine\api\modules\InvalidModuleStateException',
'Google\AppEngine\Api\Modules\ModulesException' => 'google\appengine\api\modules\ModulesException',
'Google\AppEngine\Api\Modules\ModulesService' => 'google\appengine\api\modules\ModulesService',
'Google\AppEngine\Api\Modules\TransientModulesException' => 'google\appengine\api\modules\TransientModulesException',
'Google\AppEngine\Api\TaskQueue\PushTask' => 'google\appengine\api\taskqueue\PushTask',
'Google\AppEngine\Api\TaskQueue\PushQueue' => 'google\appengine\api\taskqueue\PushQueue',
'Google\AppEngine\Api\Users\User' => 'google\appengine\api\users\User',
'Google\AppEngine\Api\Users\UserService' => 'google\appengine\api\users\UserService',
'Google\AppEngine\Api\Users\UserServiceUtil' => 'google\appengine\api\users\UserServiceUtil',
'Google\AppEngine\Api\Users\UsersException' =>'google\appengine\api\users\UsersException'
];

foreach ($classMap as $class => $alias) {
@class_alias($class, $alias);
}