Update rollbar-php to 1.5.3

Author: ArturMoczulski

vendor/rollbar/rollbar/README.md

@@ -17,7 +17,7 @@ For complete usage instructions and configuration reference, see our [PHP SDK do
 
 See our [Releases](https://github.com/rollbar/rollbar-php/releases) page for a list of all releases, including changes.
 
-## Related projects
+# Related projects
 
 A range of examples of using Rollbar PHP is available here: [Rollbar PHP Examples](https://github.com/rollbar/rollbar-php-examples).
 
@@ -34,26 +34,36 @@ Yii package: [baibaratsky/yii-rollbar](https://github.com/baibaratsky/yii-rollba
 
 Yii2 package: [baibaratsky/yii2-rollbar](https://github.com/baibaratsky/yii2-rollbar)
 
-## Help / Support
+# Help / Support
 
 If you run into any issues, please email us at [[email protected]](mailto:[email protected])
 
 For bug reports, please [open an issue on GitHub](https://github.com/rollbar/rollbar-php/issues/new).
 The best, configure your Rollbar with `verbosity` at level `\Psr\Log\LogLevel::DEBUG` and attach
 the contents of your `sys_get_temp_dir() . '/rollbar.debug.log'` (usually `/tmp/rollbar.debug.log`).
 
-## Contributing
+# Contributing
 
 1. Fork it
 2. Create your feature branch (`git checkout -b my-new-feature`)
 3. Commit your changes (`git commit -am 'Added some feature'`)
 4. Push to the branch (`git push origin my-new-feature`)
 5. Create new Pull Request
 
-## Testing
+# Testing
 Tests are in `tests`.
 To run the tests: `composer test`
 To fix code style issues: `composer fix`
 
+# Tagging
+
+1. `export ROLLBAR_PHP_TAG=[version number]`
+2. `git checkout master`
+3. Update version numbers in `src/Payload/Notifier.php` and `tests/NotifierTest.php`.
+4. `git add .`
+5. `git commit -m"Update readme.io dump and bump version numbers"`.
+6. `git push origin master`
+7. `git tag $ROLLBAR_PHP_TAG_VERSION`
+
 # License
 Rollbar-gem is free software released under the MIT License. See [LICENSE.txt](LICENSE.txt) for details.

vendor/rollbar/rollbar/src/Defaults.php

@@ -131,10 +131,16 @@ public function gitBranch($gitBranch = null, $allowExec = true)
         if ($gitBranch) {
             return $gitBranch;
         }
-        if (!isset($this->defaultGitBranch) && $allowExec) {
-            $this->defaultGitBranch = self::getGitBranch();
+        if ($allowExec) {
+            static $cachedValue;
+            static $hasExecuted = false;
+            if (!$hasExecuted) {
+                $cachedValue = self::getGitBranch();
+                $hasExecuted = true;
+            }
+            return $cachedValue;
         }
-        return $this->defaultGitBranch;
+        return null;
     }
 
     private static function getGitBranch()

vendor/rollbar/rollbar/src/Payload/Notifier.php

@@ -3,7 +3,7 @@
 class Notifier implements \Serializable
 {
     const NAME = "rollbar-php";
-    const VERSION = "1.5.2";
+    const VERSION = "1.5.3";
 
     public static function defaultNotifier()
     {

vendor/rollbar/rollbar/src/RollbarLogger.php

@@ -100,7 +100,8 @@ public function log($level, $toLog, array $context = array(), $isUncaught = fals
         if ($this->config->checkIgnored($payload, $accessToken, $toLog, $isUncaught)) {
             $response = new Response(0, "Ignored");
         } else {
-            $scrubbed = $this->scrub($payload);
+            $serialized = $payload->serialize();
+            $scrubbed = $this->scrub($serialized);
             $encoded = $this->encode($scrubbed);
             $truncated = $this->truncate($encoded);
 
@@ -188,14 +189,13 @@ protected function handleResponse($payload, $response)
     }
 
     /**
-     * @param Payload $payload
+     * @param array $serializedPayload
      * @return array
      */
-    protected function scrub(Payload $payload)
+    protected function scrub(array &$serializedPayload)
     {
-        $serialized = $payload->serialize();
-        $serialized['data'] = $this->config->getScrubber()->scrub($serialized['data']);
-        return $serialized;
+        $serializedPayload['data'] = $this->config->getScrubber()->scrub($serializedPayload['data']);
+        return $serializedPayload;
     }
 
     /**

vendor/rollbar/rollbar/src/Utilities.php

@@ -74,6 +74,8 @@ public static function serializeForRollbar(
         foreach ($obj as $key => $val) {
             if ($val instanceof \Serializable) {
                 $val = $val->serialize();
+            } elseif (is_array($val)) {
+                $val = self::serializeForRollbar($val);
             }
             if ($customKeys !== null && in_array($key, $customKeys)) {
                 $returnVal[$key] = $val;

vendor/rollbar/rollbar/tests/DataTest.php

@@ -155,7 +155,7 @@ public function testEncode()
             ->setRequest($request)
             ->setPerson($person)
             ->setServer($server)
-            ->setCustom(array("x" => "hello", "extra" => new \ArrayObject()))
+            ->setCustom(array("x" => "hello", "extra" => array('key'=>'val')))
             ->setFingerprint("big-fingerprint")
             ->setTitle("The Title")
             ->setUuid("123e4567-e89b-12d3-a456-426655440000")
@@ -175,7 +175,7 @@ public function testEncode()
         $this->assertContains("\"request\":\"{REQUEST}\"", $encoded);
         $this->assertContains("\"person\":\"{PERSON}\"", $encoded);
         $this->assertContains("\"server\":\"{SERVER}\"", $encoded);
-        $this->assertContains("\"custom\":{\"x\":\"hello\",\"extra\":{}}", $encoded);
+        $this->assertContains("\"custom\":{\"x\":\"hello\",\"extra\":{\"key\":\"val\"}}", $encoded);
         $this->assertContains("\"fingerprint\":\"big-fingerprint\"", $encoded);
         $this->assertContains("\"title\":\"The Title\"", $encoded);
         $this->assertContains("\"uuid\":\"123e4567-e89b-12d3-a456-426655440000\"", $encoded);

vendor/rollbar/rollbar/tests/DefaultsTest.php

@@ -86,6 +86,17 @@ public function testGitBranch()
         $this->assertEquals($val, $this->defaults->gitBranch());
     }
 
+    public function testGitBranchExplicit()
+    {
+        $val = 'some-branch';
+        $this->assertEquals($val, $this->defaults->gitBranch($val));
+    }
+
+    public function testGitBranchNoExec()
+    {
+        $this->assertEquals(null, $this->defaults->gitBranch(null, false));
+    }
+
     public function testServerRoot()
     {
         $_ENV["HEROKU_APP_DIR"] = "abc123";

vendor/rollbar/rollbar/tests/NotifierTest.php

@@ -29,6 +29,6 @@ public function testEncode()
     {
         $notifier = Notifier::defaultNotifier();
         $encoded = json_encode($notifier->serialize());
-        $this->assertEquals('{"name":"rollbar-php","version":"1.5.2"}', $encoded);
+        $this->assertEquals('{"name":"rollbar-php","version":"1.5.3"}', $encoded);
     }
 }