Merge branch '2.1'

orchestral · Dec 19, 2013 · 4f2e543 · 4f2e543
2 parents a053a49 + f4520ae
commit 4f2e543
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 27 deletions.
diff --git a/src/Orchestra/Widget/Drivers/Driver.php b/src/Orchestra/Widget/Drivers/Driver.php
@@ -106,22 +106,6 @@ public function getItems()
         return $this->nesty->getItems();
     }
 
-    /**
-     * Magic method to get all items.
-     *
-     * @param  string   $key
-     * @return mixed
-     * @throws \InvalidArgumentException
-     */
-    public function __get($key)
-    {
-        if ($key !== 'items') {
-            throw new InvalidArgumentException("Access to [{$key}] is not allowed.");
-        }
-
-        return $this->getItems();
-    }
-
     /**
      * Get the number of items for the current page.
      *

diff --git a/tests/Drivers/DriverTest.php b/tests/Drivers/DriverTest.php
@@ -51,7 +51,6 @@ public function testGetItemMethod()
         $stub = new DriverStub('foo', array());
 
         $this->assertInstanceOf('\Illuminate\Support\Collection', $stub->getItems());
-        $this->assertInstanceOf('\Illuminate\Support\Collection', $stub->items);
         $this->assertNull($stub->is('foo'));
 
         $stub->add('foobar')->hello('world');
@@ -63,16 +62,6 @@ public function testGetItemMethod()
 
         $this->assertEquals($expected, $stub->is('foobar'));
     }
-
-    /**
-     * Test Orchestra\Widget\Drivers\Driver::__get() throws an exception.
-     *
-     * @expectedException \InvalidArgumentException
-     */
-    public function testMagicMethodGetThrowsException()
-    {
-        with(new DriverStub('foo', array()))->helloWorld;
-    }
 }
 
 class DriverStub extends \Orchestra\Widget\Drivers\Driver