Skip to content
This repository has been archived by the owner on Dec 21, 2022. It is now read-only.

Upgrade onelogin/php-saml to v3 to support PHP 7.1+ (WIP) #131

Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
17 changes: 12 additions & 5 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,17 +4,24 @@ language: php

sudo: false

dist: trusty

matrix:
include:
- php: 5.4
env: DB=MYSQL CORE_RELEASE=3.5
env: DB=MYSQL CORE_RELEASE=3.7
- php: 5.5
env: DB=MYSQL CORE_RELEASE=3.6
env: DB=MYSQL CORE_RELEASE=3.7
- php: 5.6
env: DB=MYSQL CORE_RELEASE=3.7
- php: 7.0
env: DB=MYSQL CORE_RELEASE=3
- php: 7.1
env: DB=MYSQL CORE_RELEASE=3
- php: 7.2
env: DB=PGSQL CORE_RELEASE=3
- php: 7.3
env: DB=MYSQL CORE_RELEASE=3

before_install:
- echo "extension=ldap.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini

before_script:
- composer self-update || true
Expand Down
2 changes: 1 addition & 1 deletion code/control/LDAPSecurityController.php
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ public static function getPasswordResetLink($member, $autologinToken)
*/
public function ChangePasswordForm()
{
return Object::create('LDAPChangePasswordForm', $this, 'ChangePasswordForm');
return SS_Object::create('LDAPChangePasswordForm', $this, 'ChangePasswordForm');
}

public function lostpassword()
Expand Down
2 changes: 1 addition & 1 deletion code/helpers/SAMLHelper.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
* SAMLHelper acts as a simple wrapper for the OneLogin implementation, so that we can configure
* and inject it via the config system.
*/
class SAMLHelper extends Object
class SAMLHelper extends SS_Object
{
/**
* @var array
Expand Down
2 changes: 1 addition & 1 deletion code/model/LDAPGateway.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
* Works within the LDAP domain model to provide basic operations.
* These are exclusively used in LDAPService for constructing more complex operations.
*/
class LDAPGateway extends Object
class LDAPGateway extends SS_Object
{
/**
* @var array
Expand Down
2 changes: 1 addition & 1 deletion code/services/LDAPService.php
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
*
* LDAPService relies on Zend LDAP module's data structures for some parameters and some return values.
*/
class LDAPService extends Object implements Flushable
class LDAPService extends SS_Object implements Flushable
{
/**
* @var array
Expand Down
2 changes: 1 addition & 1 deletion code/services/SAMLConfiguration.php
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
*
* https://syncplicity.zendesk.com/hc/en-us/articles/202392814-Single-sign-on-with-ADFS
*/
class SAMLConfiguration extends Object
class SAMLConfiguration extends SS_Object
{
/**
* @var bool
Expand Down
4 changes: 2 additions & 2 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,12 @@
],
"require": {
"php": ">=5.4",
"silverstripe/framework": "~3.1",
"silverstripe/framework": "^3.7",
"symbiote/silverstripe-queuedjobs": "^3",
"zendframework/zend-ldap": "^2.5.1",
"zendframework/zend-authentication": "^2.5.1",
"zendframework/zend-session": "^2.5.1",
"onelogin/php-saml": "^2.10.7"
"onelogin/php-saml": "^3"
},
"require-dev": {
"phpunit/phpunit": "~4.8"
Expand Down