From 25f26ed119d437e6c2f3b62045a2fd112482775f Mon Sep 17 00:00:00 2001
From: webchick <drupal@webchick.net>
Date: Mon, 31 Aug 2015 09:29:45 -0700
Subject: [PATCH] Issue #2550641 by damiankloip: Use assert() in
 Drupal\Core\DependencyInjection\Container::__sleep instead of trigger error

---
 core/lib/Drupal/Core/DependencyInjection/Container.php |  2 +-
 .../Core/DependencyInjection/ContainerBuilder.php      |  2 +-
 .../Core/DependencyInjection/ContainerBuilderTest.php  | 10 ++++++++++
 .../Tests/Core/DependencyInjection/ContainerTest.php   |  2 +-
 4 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/core/lib/Drupal/Core/DependencyInjection/Container.php b/core/lib/Drupal/Core/DependencyInjection/Container.php
index b4cac53c1c3..c86aace2a9d 100644
--- a/core/lib/Drupal/Core/DependencyInjection/Container.php
+++ b/core/lib/Drupal/Core/DependencyInjection/Container.php
@@ -31,7 +31,7 @@ class Container extends DrupalContainer {
    * {@inheritdoc}
    */
   public function __sleep() {
-    trigger_error('The container was serialized.', E_USER_ERROR);
+    assert(FALSE, 'The container was serialized.');
     return array_keys(get_object_vars($this));
   }
 
diff --git a/core/lib/Drupal/Core/DependencyInjection/ContainerBuilder.php b/core/lib/Drupal/Core/DependencyInjection/ContainerBuilder.php
index ce692b53445..e00426fc4ba 100644
--- a/core/lib/Drupal/Core/DependencyInjection/ContainerBuilder.php
+++ b/core/lib/Drupal/Core/DependencyInjection/ContainerBuilder.php
@@ -118,7 +118,7 @@ class ContainerBuilder extends SymfonyContainerBuilder {
    * {@inheritdoc}
    */
   public function __sleep() {
-    trigger_error('The container was serialized.', E_USER_ERROR);
+    assert(FALSE, 'The container was serialized.');
     return array_keys(get_object_vars($this));
   }
 
diff --git a/core/tests/Drupal/Tests/Core/DependencyInjection/ContainerBuilderTest.php b/core/tests/Drupal/Tests/Core/DependencyInjection/ContainerBuilderTest.php
index 0df17c44e88..157349dce18 100644
--- a/core/tests/Drupal/Tests/Core/DependencyInjection/ContainerBuilderTest.php
+++ b/core/tests/Drupal/Tests/Core/DependencyInjection/ContainerBuilderTest.php
@@ -70,4 +70,14 @@ class ContainerBuilderTest extends UnitTestCase {
     $container->register('Bar');
   }
 
+  /**
+   * Tests serialization.
+   *
+   * @expectedException \AssertionError
+   */
+  public function testSerialize() {
+    $container = new ContainerBuilder();
+    serialize($container);
+  }
+
 }
diff --git a/core/tests/Drupal/Tests/Core/DependencyInjection/ContainerTest.php b/core/tests/Drupal/Tests/Core/DependencyInjection/ContainerTest.php
index 377f7be79be..ffbb5919eda 100644
--- a/core/tests/Drupal/Tests/Core/DependencyInjection/ContainerTest.php
+++ b/core/tests/Drupal/Tests/Core/DependencyInjection/ContainerTest.php
@@ -20,7 +20,7 @@ class ContainerTest extends UnitTestCase {
   /**
    * Tests serialization.
    *
-   * @expectedException \PHPUnit_Framework_Error
+   * @expectedException \AssertionError
    */
   public function testSerialize() {
     $container = new Container();