Merge pull request #602 from DirectoryTree/v3.0

V3.0

Author: stevebauman

.github/ISSUE_TEMPLATE/bug_report.md

@@ -13,6 +13,6 @@ assignees: ''
 -->
 **Environment:**
  - LDAP Server Type: [e.g. ActiveDirectory / OpenLDAP / FreeIPA]
- - PHP Version: [e.g. 7.3 / 7.4 / 8.0]
+ - PHP Version: [e.g. 8.1 / 8.2]
 
 **Describe the bug:**

.github/ISSUE_TEMPLATE/support---help-request.md

@@ -17,4 +17,4 @@ assignees: ''
 -->
 **Environment:**
  - LDAP Server Type: [e.g. ActiveDirectory / OpenLDAP / FreeIPA]
- - PHP Version: [e.g. 7.3 / 7.4 / 8.0]
+ - PHP Version: [e.g. 8.1 / 8.2]

.github/workflows/run-integration-tests.yml

@@ -28,7 +28,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-latest]
-        php: [8.1, 8.0, 7.4]
+        php: [8.1, 8.2]
 
     name: ${{ matrix.os }} - P${{ matrix.php }}
 

.github/workflows/run-tests.yml

@@ -15,7 +15,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-latest, windows-latest]
-        php: [8.1, 8.0, 7.4, 7.3]
+        php: [8.1, 8.2]
 
     steps:
       - name: Checkout code

.styleci.yml

@@ -1 +1,3 @@
 preset: laravel
+enabled:
+  - no_superfluous_phpdoc_tags

composer.json

@@ -29,20 +29,22 @@
         }
     ],
     "require": {
-        "php": ">=7.3",
+        "php": ">=8.1",
         "ext-ldap": "*",
         "ext-json": "*",
-        "psr/log": "^1.0|^2.0|^3.0",
-        "psr/simple-cache": "^1.0|^2.0",
-        "nesbot/carbon": "^1.0|^2.0",
-        "tightenco/collect": "^5.6|^6.0|^7.0|^8.0|^9.0",
-        "illuminate/contracts": "^5.0|^6.0|^7.0|^8.0|^9.0|^10.0",
-        "symfony/polyfill-php80": "^1.25"
+        "ext-iconv": "*",
+        "psr/log": "*",
+        "psr/simple-cache": "^2.0|^3.0",
+        "nesbot/carbon": "*",
+        "illuminate/contracts": "^8.0|^9.0|^10.0",
+        "illuminate/collections": "^8.0|^9.0|^10.0"
     },
     "require-dev": {
         "phpunit/phpunit": "^9.0",
         "mockery/mockery": "^1.0",
-        "spatie/ray": "^1.24"
+        "spatie/ray": "^1.24",
+        "laravel/pint": "^1.6",
+        "fakerphp/faker": "^1.21"
     },
     "archive": {
         "exclude": [

readme.md

@@ -32,9 +32,9 @@
 </p>
 
 <h4 align="center">
-    <a href="https://ldaprecord.com/docs/core/v2/quickstart/">Quickstart</a>
+    <a href="https://ldaprecord.com/docs/core/v3/quickstart/">Quickstart</a>
     <span> · </span>
-    <a href="https://ldaprecord.com/docs/core/v2/">Documentation</a>
+    <a href="https://ldaprecord.com/docs/core/v3/">Documentation</a>
     <span> · </span>
     <a href="https://github.com/DirectoryTree/LdapRecord-Laravel">Laravel Integration</a>
     <span> · </span>
@@ -67,15 +67,15 @@ Active Directory Features
 
 🚪 **Enable / Disable Accounts**
 
-Detect and assign User Account Control values on accounts with the fluent [Account Control builder](https://ldaprecord.com/docs/core/v2/active-directory/users/#uac).
+Detect and assign User Account Control values on accounts with the fluent [Account Control builder](https://ldaprecord.com/docs/core/v3/active-directory/users/#uac).
 
 🔑 **Reset / Change Passwords**
 
-Built-in support for [changing](https://ldaprecord.com/docs/core/v2/active-directory/users/#changing-passwords) and [resetting](https://ldaprecord.com/docs/core/v2/active-directory/users/#resetting-passwords) passwords on Active Directory accounts.
+Built-in support for [changing](https://ldaprecord.com/docs/core/v3/active-directory/users/#changing-passwords) and [resetting](https://ldaprecord.com/docs/core/v3/active-directory/users/#resetting-passwords) passwords on Active Directory accounts.
 
 🗑 **Restore Deleted Objects**
 
-We've all been there -- accidentally deleting a user or group in Active Directory. [Restore them](https://ldaprecord.com/docs/core/v2/models/#restoring-deleted-models) by seamlessly accessing your directory's recycle bin.
+We've all been there -- accidentally deleting a user or group in Active Directory. [Restore them](https://ldaprecord.com/docs/core/v3/models/#restoring-deleted-models) by seamlessly accessing your directory's recycle bin.
 
 ---
 

src/Auth/Events/Event.php

@@ -8,33 +8,23 @@ abstract class Event
 {
     /**
      * The connection that the username and password is being bound on.
-     *
-     * @var LdapInterface
      */
-    protected $connection;
+    protected LdapInterface $connection;
 
     /**
      * The username that is being used for binding.
-     *
-     * @var string
      */
-    protected $username;
+    protected ?string $username;
 
     /**
      * The password that is being used for binding.
-     *
-     * @var string
      */
-    protected $password;
+    protected ?string $password;
 
     /**
      * Constructor.
-     *
-     * @param  LdapInterface  $connection
-     * @param  string  $username
-     * @param  string  $password
      */
-    public function __construct(LdapInterface $connection, $username, $password)
+    public function __construct(LdapInterface $connection, string $username = null, string $password = null)
     {
         $this->connection = $connection;
         $this->username = $username;
@@ -43,30 +33,24 @@ public function __construct(LdapInterface $connection, $username, $password)
 
     /**
      * Returns the events connection.
-     *
-     * @return LdapInterface
      */
-    public function getConnection()
+    public function getConnection(): LdapInterface
     {
         return $this->connection;
     }
 
     /**
      * Returns the authentication events username.
-     *
-     * @return string
      */
-    public function getUsername()
+    public function getUsername(): ?string
     {
         return $this->username;
     }
 
     /**
      * Returns the authentication events password.
-     *
-     * @return string
      */
-    public function getPassword()
+    public function getPassword(): ?string
     {
         return $this->password;
     }