Skip to content
This repository was archived by the owner on Jul 24, 2023. It is now read-only.

Start the process to support Laravel 7 #853

Closed
wants to merge 1 commit into from
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
10 changes: 5 additions & 5 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,14 @@
"license": "MIT",
"type": "project",
"require": {
"php": ">=7.1",
"adldap2/adldap2": "^10.1",
"illuminate/support": "~5.5|~6.0"
"php": ">=7.2",
"adldap2/adldap2": "dev-master",
"illuminate/support": "~7.0"
},
"require-dev": {
"mockery/mockery": "~1.0",
"phpunit/phpunit": "~7.0",
"orchestra/testbench": "~3.7"
"phpunit/phpunit": "~8.5",
"orchestra/testbench": "~5.0"
},
"archive": {
"exclude": ["/tests"]
Expand Down
28 changes: 12 additions & 16 deletions tests/DatabaseImporterTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -44,51 +44,47 @@ public function ldap_users_are_not_duplicated_with_alternate_casing()
$this->assertTrue($m1->is($m2));
}

/**
* @test
* @expectedException \UnexpectedValueException
*/
/** @test */
public function exception_is_thrown_when_guid_is_null()
{
$this->expectException(\UnexpectedValueException::class);

$u = $this->makeLdapUser([
'objectguid' => null,
]);

(new Import($u, new TestUser()))->handle();
}

/**
* @test
* @expectedException \UnexpectedValueException
*/
/** @test */
public function exception_is_thrown_when_guid_is_empty()
{
$this->expectException(\UnexpectedValueException::class);

$u = $this->makeLdapUser([
'objectguid' => ' ',
]);

(new Import($u, new TestUser()))->handle();
}

/**
* @test
* @expectedException \UnexpectedValueException
*/
/** @test */
public function exception_is_thrown_when_username_is_null()
{
$this->expectException(\UnexpectedValueException::class);

$u = $this->makeLdapUser([
'userprincipalname' => null,
]);

(new Import($u, new TestUser()))->handle();
}

/**
* @test
* @expectedException \UnexpectedValueException
*/
/** @test */
public function exception_is_thrown_when_username_is_empty()
{
$this->expectException(\UnexpectedValueException::class);

$u = $this->makeLdapUser([
'userprincipalname' => ' ',
]);
Expand Down
7 changes: 3 additions & 4 deletions tests/DatabaseProviderTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,11 @@ class DatabaseProviderTest extends DatabaseTestCase
{
use WithFaker;

/**
* @test
* @expectedException \RuntimeException
*/
/** @test */
public function configuration_not_found_exception_when_config_is_null()
{
$this->expectException(\RuntimeException::class);

config(['ldap' => null]);

App::make(AdldapInterface::class);
Expand Down