diff --git a/docs/tutorial/tutorial_authentication.php b/docs/tutorial/tutorial_authentication.php
index 944b0af..1f28c38 100644
--- a/docs/tutorial/tutorial_authentication.php
+++ b/docs/tutorial/tutorial_authentication.php
@@ -17,7 +17,8 @@
             );
     foreach ( $status as $line )
     {
-        list( $key, $value ) = each( $line );
+        $value = current( $line );
+        $key = key( $line );
         echo $err[$key][$value] . "\n";
     }
 }
diff --git a/docs/tutorial/tutorial_group.php b/docs/tutorial/tutorial_group.php
index a6afa94..e044109 100644
--- a/docs/tutorial/tutorial_group.php
+++ b/docs/tutorial/tutorial_group.php
@@ -32,7 +32,8 @@
             );
     foreach ( $status as $line )
     {
-        list( $key, $value ) = each( $line );
+        $value = current( $line );
+        $key = key( $line );
         echo $err[$key][$value] . "\n";
     }
 }
diff --git a/docs/tutorial/tutorial_htpasswd.php b/docs/tutorial/tutorial_htpasswd.php
index 6e70504..baab97b 100644
--- a/docs/tutorial/tutorial_htpasswd.php
+++ b/docs/tutorial/tutorial_htpasswd.php
@@ -18,7 +18,8 @@
             );
     foreach ( $status as $line )
     {
-        list( $key, $value ) = each( $line );
+        $value = current( $line );
+        $key = key( $line );
         echo $err[$key][$value] . "\n";
     }
 }
diff --git a/docs/tutorial/tutorial_ldap.php b/docs/tutorial/tutorial_ldap.php
index cd72ec5..951ca61 100644
--- a/docs/tutorial/tutorial_ldap.php
+++ b/docs/tutorial/tutorial_ldap.php
@@ -18,7 +18,8 @@
             );
     foreach ( $status as $line )
     {
-        list( $key, $value ) = each( $line );
+        $value = current( $line );
+        $key = key( $line );
         echo $err[$key][$value] . "\n";
     }
 }
diff --git a/docs/tutorial/tutorial_multiple_credentials.php b/docs/tutorial/tutorial_multiple_credentials.php
index 5b1f61c..da600e2 100644
--- a/docs/tutorial/tutorial_multiple_credentials.php
+++ b/docs/tutorial/tutorial_multiple_credentials.php
@@ -37,7 +37,8 @@
 
     foreach ( $status as $line => $error )
     {
-        list( $key, $value ) = each( $error );
+        $value = current( $error );
+        $key = key( $error );
         echo $err[$line][$key][$value] . "\n";
     }
 }
diff --git a/docs/tutorial/tutorial_openid_dumb.php b/docs/tutorial/tutorial_openid_dumb.php
index 9441afe..6573288 100644
--- a/docs/tutorial/tutorial_openid_dumb.php
+++ b/docs/tutorial/tutorial_openid_dumb.php
@@ -39,7 +39,8 @@
              );
     foreach ( $status as $line )
     {
-        list( $key, $value ) = each( $line );
+        $value = current( $line );
+        $key = key( $line );
         echo $err[$key][$value] . "\n";
     }
 ?>
diff --git a/docs/tutorial/tutorial_openid_smart.php b/docs/tutorial/tutorial_openid_smart.php
index 071d919..4af0f36 100644
--- a/docs/tutorial/tutorial_openid_smart.php
+++ b/docs/tutorial/tutorial_openid_smart.php
@@ -46,7 +46,9 @@
     $err["session"] = "";
     for ( $i = 0; $i < count( $status ); $i++ )
     {
-        list( $key, $value ) = each( $status[$i] );
+        $value = current( $status[$i] );
+        $key = key( $status[$i] );
+
         switch ( $key )
         {
             case 'ezcAuthenticationOpenidFilter':
diff --git a/docs/tutorial/tutorial_session.php b/docs/tutorial/tutorial_session.php
index 26e3b67..b7015c5 100644
--- a/docs/tutorial/tutorial_session.php
+++ b/docs/tutorial/tutorial_session.php
@@ -27,7 +27,8 @@
             );
     foreach ( $status as $line )
     {
-        list( $key, $value ) = each( $line );
+        $value = current( $line );
+        $key = key( $line );
         echo $err[$key][$value] . "\n";
     }
 }
diff --git a/docs/tutorial/tutorial_typekey.php b/docs/tutorial/tutorial_typekey.php
index 2147ad4..6e96eec 100644
--- a/docs/tutorial/tutorial_typekey.php
+++ b/docs/tutorial/tutorial_typekey.php
@@ -32,7 +32,8 @@
              );
     foreach ( $status as $line )
     {
-        list( $key, $value ) = each( $line );
+        $value = current( $line );
+        $key = key( $line );
         echo $err[$key][$value] . "\n";
     }
 ?>
diff --git a/src/authentication.php b/src/authentication.php
index 869f788..9ac1994 100644
--- a/src/authentication.php
+++ b/src/authentication.php
@@ -58,7 +58,8 @@
  *             );
  *     foreach ( $status as $line )
  *     {
- *         list( $key, $value ) = each( $line );
+ *         $value = current( $line );
+ *         $key = key( $line );
  *         echo $err[$key][$value] . "\n";
  *     }
  * }
@@ -263,7 +264,8 @@ public function run()
                     // status of the Authentication object
                     foreach ( $statuses as $status )
                     {
-                        list( $key, $value ) = each( $status );
+                        $value = current( $status );
+                        $key = key( $status );
                         $this->status->append( $key, $value );
                     }
                 }
diff --git a/src/filters/group/group_filter.php b/src/filters/group/group_filter.php
index 7091266..879dddc 100644
--- a/src/filters/group/group_filter.php
+++ b/src/filters/group/group_filter.php
@@ -80,7 +80,8 @@
  *             );
  *     foreach ( $status as $line => $error )
  *     {
- *         list( $key, $value ) = each( $error );
+ *         $value = current( $error );
+ *         $key = key( $error );
  *         echo $err[$line][$key][$value] . "\n";
  *     }
  * }
@@ -133,7 +134,8 @@
  *
  *     foreach ( $status as $line => $error )
  *     {
- *         list( $key, $value ) = each( $error );
+ *         $value = current( $error );
+ *         $key = key( $error );
  *         echo $err[$line][$key][$value] . "\n";
  *     }
  * }
diff --git a/src/filters/htpasswd/htpasswd_filter.php b/src/filters/htpasswd/htpasswd_filter.php
index a97a7ef..fbed082 100644
--- a/src/filters/htpasswd/htpasswd_filter.php
+++ b/src/filters/htpasswd/htpasswd_filter.php
@@ -60,7 +60,8 @@
  *             );
  *     foreach ( $status as $line )
  *     {
- *         list( $key, $value ) = each( $line );
+ *         $value = current( $line );
+ *         $key = key( $line );
  *         echo $err[$key][$value] . "\n";
  *     }
  * }
diff --git a/src/filters/ldap/ldap_filter.php b/src/filters/ldap/ldap_filter.php
index 79cf6fd..133a948 100644
--- a/src/filters/ldap/ldap_filter.php
+++ b/src/filters/ldap/ldap_filter.php
@@ -52,7 +52,8 @@
  *             );
  *     foreach ( $status as $line )
  *     {
- *         list( $key, $value ) = each( $line );
+ *         $value = current( $line );
+ *         $key = key( $line );
  *         echo $err[$key][$value] . "\n";
  *     }
  * }
diff --git a/src/filters/openid/openid_filter.php b/src/filters/openid/openid_filter.php
index aa6ffa1..a9c47ec 100644
--- a/src/filters/openid/openid_filter.php
+++ b/src/filters/openid/openid_filter.php
@@ -148,7 +148,8 @@
  *              );
  *     foreach ( $status as $line )
  *     {
- *         list( $key, $value ) = each( $line );
+ *         $value = current( $line );
+ *         $key = key( $line );
  *         echo $err[$key][$value] . "\n";
  *     }
  * ?>
diff --git a/src/filters/typekey/typekey_filter.php b/src/filters/typekey/typekey_filter.php
index d770ced..67a9953 100644
--- a/src/filters/typekey/typekey_filter.php
+++ b/src/filters/typekey/typekey_filter.php
@@ -117,7 +117,8 @@
  *              );
  *     foreach ( $status as $line )
  *     {
- *         list( $key, $value ) = each( $line );
+ *         $value = current( $line );
+ *         $key = key( $line );
  *         echo $err[$key][$value] . "\n";
  *     }
  * ?>
diff --git a/src/session/authentication_session.php b/src/session/authentication_session.php
index 391bec5..eb7434d 100644
--- a/src/session/authentication_session.php
+++ b/src/session/authentication_session.php
@@ -68,7 +68,8 @@
  *             );
  *     foreach ( $status as $line )
  *     {
- *         list( $key, $value ) = each( $line );
+ *         $value = current( $line );
+ *         $key = key( $line );
  *         echo $err[$key][$value] . "\n";
  *     }
  * }