updated core from 8.4 to 8.5 : bug with login_destination

core/modules/book/src/BookOutline.php

@@ -39,12 +39,14 @@ class BookOutline {
     if ($book_link['pid'] == 0) {
       return NULL;
     }
-    // Assigning the array to $flat resets the array pointer for use with each().
     $flat = $this->bookManager->bookTreeGetFlat($book_link);
+    reset($flat);
     $curr = NULL;
     do {
       $prev = $curr;
-      list($key, $curr) = each($flat);
+      $key = key($flat);
+      $curr = current($flat);
+      next($flat);
     } while ($key && $key != $book_link['nid']);
 
     if ($key == $book_link['nid']) {
@@ -78,10 +80,11 @@ class BookOutline {
    *   $book_link.
    */
   public function nextLink(array $book_link) {
-    // Assigning the array to $flat resets the array pointer for use with each().
     $flat = $this->bookManager->bookTreeGetFlat($book_link);
+    reset($flat);
     do {
-      list($key,) = each($flat);
+      $key = key($flat);
+      next($flat);
     } while ($key && $key != $book_link['nid']);
 
     if ($key == $book_link['nid']) {

core/modules/book/src/BookOutlineStorageInterface.php

@@ -69,7 +69,7 @@ interface BookOutlineStorageInterface {
   public function delete($nid);
 
   /**
-   * Loads book's children using it's parent ID.
+   * Loads book's children using its parent ID.
    *
    * @param int $pid
    *   The book's parent ID.

core/modules/book/src/Form/BookAdminEditForm.php

@@ -15,6 +15,8 @@ use Symfony\Component\DependencyInjection\ContainerInterface;
 
 /**
  * Provides a form for administering a single book's hierarchy.
+ *
+ * @internal
  */
 class BookAdminEditForm extends FormBase {
 

core/modules/book/src/Form/BookOutlineForm.php

@@ -13,6 +13,8 @@ use Symfony\Component\DependencyInjection\ContainerInterface;
 
 /**
  * Displays the book outline form.
+ *
+ * @internal
  */
 class BookOutlineForm extends ContentEntityForm {
 

core/modules/book/src/Form/BookRemoveForm.php

@@ -10,6 +10,8 @@ use Symfony\Component\DependencyInjection\ContainerInterface;
 
 /**
  * Remove form for book module.
+ *
+ * @internal
  */
 class BookRemoveForm extends ConfirmFormBase {
 

core/modules/book/src/Form/BookSettingsForm.php

@@ -7,6 +7,8 @@ use Drupal\Core\Form\FormStateInterface;
 
 /**
  * Configure book settings for this site.
+ *
+ * @internal
  */
 class BookSettingsForm extends ConfigFormBase {