Update Composer, update everything

web/core/modules/book/src/Plugin/Validation/Constraint/BookOutlineConstraint.php

@@ -0,0 +1,19 @@
+<?php
+
+namespace Drupal\book\Plugin\Validation\Constraint;
+
+use Symfony\Component\Validator\Constraint;
+
+/**
+ * Validation constraint for changing the book outline in pending revisions.
+ *
+ * @Constraint(
+ *   id = "BookOutline",
+ *   label = @Translation("Book outline.", context = "Validation"),
+ * )
+ */
+class BookOutlineConstraint extends Constraint {
+
+  public $message = 'You can only change the book outline for the <em>published</em> version of this content.';
+
+}

web/core/modules/book/src/Plugin/Validation/Constraint/BookOutlineConstraintValidator.php

@@ -0,0 +1,77 @@
+<?php
+
+namespace Drupal\book\Plugin\Validation\Constraint;
+
+use Drupal\book\BookManagerInterface;
+use Drupal\Core\DependencyInjection\ContainerInjectionInterface;
+use Symfony\Component\DependencyInjection\ContainerInterface;
+use Symfony\Component\Validator\Constraint;
+use Symfony\Component\Validator\ConstraintValidator;
+
+/**
+ * Constraint validator for changing the book outline in pending revisions.
+ */
+class BookOutlineConstraintValidator extends ConstraintValidator implements ContainerInjectionInterface {
+
+  /**
+   * The book manager.
+   *
+   * @var \Drupal\book\BookManagerInterface
+   */
+  protected $bookManager;
+
+  /**
+   * Creates a new BookOutlineConstraintValidator instance.
+   *
+   * @param \Drupal\book\BookManagerInterface $book_manager
+   *   The book manager.
+   */
+  public function __construct(BookManagerInterface $book_manager) {
+    $this->bookManager = $book_manager;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public static function create(ContainerInterface $container) {
+    return new static(
+      $container->get('book.manager')
+    );
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function validate($entity, Constraint $constraint) {
+    if (isset($entity) && !$entity->isNew() && !$entity->isDefaultRevision()) {
+      /** @var \Drupal\Core\Entity\ContentEntityInterface $original */
+      $original = $this->bookManager->loadBookLink($entity->id(), FALSE) ?: [
+        'bid' => 0,
+        'weight' => 0,
+      ];
+      if (empty($original['pid'])) {
+        $original['pid'] = -1;
+      }
+
+      if ($entity->book['bid'] != $original['bid']) {
+        $this->context->buildViolation($constraint->message)
+          ->atPath('book.bid')
+          ->setInvalidValue($entity)
+          ->addViolation();
+      }
+      if ($entity->book['pid'] != $original['pid']) {
+        $this->context->buildViolation($constraint->message)
+          ->atPath('book.pid')
+          ->setInvalidValue($entity)
+          ->addViolation();
+      }
+      if ($entity->book['weight'] != $original['weight']) {
+        $this->context->buildViolation($constraint->message)
+          ->atPath('book.weight')
+          ->setInvalidValue($entity)
+          ->addViolation();
+      }
+    }
+  }
+
+}

web/core/modules/book/src/Plugin/migrate/source/Book.php

@@ -0,0 +1,63 @@
+<?php
+
+namespace Drupal\book\Plugin\migrate\source;
+
+use Drupal\migrate_drupal\Plugin\migrate\source\DrupalSqlBase;
+
+/**
+ * Drupal 6 and 7 book source.
+ *
+ * @MigrateSource(
+ *   id = "book",
+ *   source_module = "book",
+ * )
+ */
+class Book extends DrupalSqlBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  public function query() {
+    $query = $this->select('book', 'b')->fields('b', ['nid', 'bid']);
+    $query->join('menu_links', 'ml', 'b.mlid = ml.mlid');
+    $ml_fields = ['mlid', 'plid', 'weight', 'has_children', 'depth'];
+    foreach (range(1, 9) as $i) {
+      $field = "p$i";
+      $ml_fields[] = $field;
+      $query->orderBy('ml.' . $field);
+    }
+    return $query->fields('ml', $ml_fields);
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getIds() {
+    $ids['mlid']['type'] = 'integer';
+    $ids['mlid']['alias'] = 'ml';
+    return $ids;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function fields() {
+    return [
+      'nid' => $this->t('Node ID'),
+      'bid' => $this->t('Book ID'),
+      'mlid' => $this->t('Menu link ID'),
+      'plid' => $this->t('Parent link ID'),
+      'weight' => $this->t('Weight'),
+      'p1' => $this->t('The first mlid in the materialized path. If N = depth, then pN must equal the mlid. If depth > 1 then p(N-1) must equal the parent link mlid. All pX where X > depth must equal zero. The columns p1 .. p9 are also called the parents.'),
+      'p2' => $this->t('The second mlid in the materialized path. See p1.'),
+      'p3' => $this->t('The third mlid in the materialized path. See p1.'),
+      'p4' => $this->t('The fourth mlid in the materialized path. See p1.'),
+      'p5' => $this->t('The fifth mlid in the materialized path. See p1.'),
+      'p6' => $this->t('The sixth mlid in the materialized path. See p1.'),
+      'p7' => $this->t('The seventh mlid in the materialized path. See p1.'),
+      'p8' => $this->t('The eighth mlid in the materialized path. See p1.'),
+      'p9' => $this->t('The ninth mlid in the materialized path. See p1.'),
+    ];
+  }
+
+}

web/core/modules/book/src/Plugin/migrate/source/d6/Book.php

@@ -2,62 +2,20 @@
 
 namespace Drupal\book\Plugin\migrate\source\d6;
 
-use Drupal\migrate_drupal\Plugin\migrate\source\DrupalSqlBase;
+use Drupal\book\Plugin\migrate\source\Book as BookGeneral;
+
+@trigger_error('Book is deprecated in Drupal 8.6.x and will be removed before Drupal 9.0.x. Use \Drupal\book\Plugin\migrate\source\Book instead. See https://www.drupal.org/node/2947487 for more information.', E_USER_DEPRECATED);
 
 /**
  * Drupal 6 book source.
  *
  * @MigrateSource(
- *   id = "d6_book"
+ *   id = "d6_book",
+ *   source_module = "book"
  * )
+ *
+ * @deprecated in Drupal 8.6.x, to be removed before Drupal 9.0.x. Use
+ * \Drupal\book\Plugin\migrate\source\Book instead. See
+ * https://www.drupal.org/node/2947487 for more information.
  */
-class Book extends DrupalSqlBase {
-
-  /**
-   * {@inheritdoc}
-   */
-  public function query() {
-    $query = $this->select('book', 'b')->fields('b', ['nid', 'bid']);
-    $query->join('menu_links', 'ml', 'b.mlid = ml.mlid');
-    $ml_fields = ['mlid', 'plid', 'weight', 'has_children', 'depth'];
-    for ($i = 1; $i <= 9; $i++) {
-      $field = "p$i";
-      $ml_fields[] = $field;
-      $query->orderBy('ml.' . $field);
-    }
-    $query->fields('ml', $ml_fields);
-    return $query;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getIds() {
-    $ids['mlid']['type'] = 'integer';
-    $ids['mlid']['alias'] = 'ml';
-    return $ids;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function fields() {
-    return [
-      'nid' => $this->t('Node ID'),
-      'bid' => $this->t('Book ID'),
-      'mlid' => $this->t('Menu link ID'),
-      'plid' => $this->t('Parent link ID'),
-      'weight' => $this->t('Weight'),
-      'p1' => $this->t('The first mlid in the materialized path. If N = depth, then pN must equal the mlid. If depth > 1 then p(N-1) must equal the parent link mlid. All pX where X > depth must equal zero. The columns p1 .. p9 are also called the parents.'),
-      'p2' => $this->t('The second mlid in the materialized path. See p1.'),
-      'p3' => $this->t('The third mlid in the materialized path. See p1.'),
-      'p4' => $this->t('The fourth mlid in the materialized path. See p1.'),
-      'p5' => $this->t('The fifth mlid in the materialized path. See p1.'),
-      'p6' => $this->t('The sixth mlid in the materialized path. See p1.'),
-      'p7' => $this->t('The seventh mlid in the materialized path. See p1.'),
-      'p8' => $this->t('The eighth mlid in the materialized path. See p1.'),
-      'p9' => $this->t('The ninth mlid in the materialized path. See p1.'),
-    ];
-  }
-
-}
+class Book extends BookGeneral {}