[MediaWiki-commits] [Gerrit] Don't try to serialize the logger when logging - change (wikimedia...SmashPig)

[Ejegg (Code Review)]

Ejegg has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/273528

Change subject: Don't try to serialize the logger when logging
......................................................................

Don't try to serialize the logger when logging

Also, get rid of a bogus array_flip - we just want to use a flat
array of strings, not a hash.

Change-Id: I9cddc996b21a4fdf780fee00e3b33a1a7020b5e2
---
M Core/DataStores/JsonSerializableObject.php
M PaymentProviders/Adyen/Jobs/DownloadReportJob.php
2 files changed, 2 insertions(+), 4 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/SmashPig 
refs/changes/28/273528/1

diff --git a/Core/DataStores/JsonSerializableObject.php 
b/Core/DataStores/JsonSerializableObject.php
index f4b64f0..3a7736b 100644
--- a/Core/DataStores/JsonSerializableObject.php
+++ b/Core/DataStores/JsonSerializableObject.php
@@ -1,7 +1,5 @@
 <?php namespace SmashPig\Core\DataStores;
 
-use SmashPig\Core\Logging\Logger;
-
 /**
  * Base class providing generic serialization/deserialization capabilities.
  */
@@ -57,11 +55,10 @@
        public function toJson( $resumeUse = true ) {
                $this->__sleep();
 
-               $ignore = array_flip( $this->propertiesExcludedFromExport );
                $properties = array();
 
                foreach ( get_object_vars( $this ) as $propName => $propValue ) 
{
-                       if ( !array_key_exists( $propName, $ignore ) ) {
+                       if ( !array_key_exists( $propName, 
$this->propertiesExcludedFromExport ) ) {
                                if ( is_object( $propValue ) ) {
                                        if ( $propValue instanceof 
JsonSerializableObject ) {
                                                $properties[ $propName ] = 
$propValue->toJson( $resumeUse );
diff --git a/PaymentProviders/Adyen/Jobs/DownloadReportJob.php 
b/PaymentProviders/Adyen/Jobs/DownloadReportJob.php
index 2f566c1..a1c3848 100644
--- a/PaymentProviders/Adyen/Jobs/DownloadReportJob.php
+++ b/PaymentProviders/Adyen/Jobs/DownloadReportJob.php
@@ -21,6 +21,7 @@
        protected $reportUrl;
 
        protected $downloadLoc;
+       protected $propertiesExcludedFromExport = array( 'logger' );
 
        public static function factory( $account, $url ) {
                $obj = new DownloadReportJob();

-- 
To view, visit https://gerrit.wikimedia.org/r/273528
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I9cddc996b21a4fdf780fee00e3b33a1a7020b5e2
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/SmashPig
Gerrit-Branch: master
Gerrit-Owner: Ejegg <eeggles...@wikimedia.org>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits