Merge pull request #629 from SammyK/finish-599

Finishes off #599

Author: SammyK

src/Facebook/autoload.php

@@ -32,9 +32,7 @@
     throw new Exception('The Facebook SDK requires PHP version 5.4 or higher.');
 }
 
-if (defined('FACEBOOK_SDK_POLYFILLS_LOADED') === false) {
-    require_once __DIR__ . 'polyfills.php';
-}
+require_once __DIR__ . 'polyfills.php';
 
 /**
  * Register the autoloader for the Facebook SDK classes.

src/Facebook/polyfills.php

@@ -22,8 +22,6 @@
  *
  */
 
-define('FACEBOOK_SDK_POLYFILLS_LOADED', 1);
-
 /**
  * @see https://github.com/sarciszewski/php-future/blob/master/src/Security.php#L37-L51
  */

tests/FacebookTest.php

@@ -41,12 +41,6 @@ class FacebookTest extends \PHPUnit_Framework_TestCase
         'app_secret' => 'foo_secret',
     ];
 
-    public function testLoadPolyfills()
-    {
-        $this->assertEquals(true, defined('FACEBOOK_SDK_POLYFILLS_LOADED'));
-        $this->assertEquals(1, FACEBOOK_SDK_POLYFILLS_LOADED);
-    }
-
     /**
      * @expectedException \Facebook\Exceptions\FacebookSDKException
      */

tests/HttpClients/FacebookStreamHttpClientTest.php

@@ -95,7 +95,7 @@ public function testCanSendNormalRequest()
         $this->streamMock
             ->shouldReceive('getResponseHeaders')
             ->once()
-            ->andReturn(explode(PHP_EOL, trim($this->fakeRawHeader)));
+            ->andReturn(explode("\n", trim($this->fakeRawHeader)));
         $this->streamMock
             ->shouldReceive('fileGetContents')
             ->once()