File tree Expand file tree Collapse file tree 2 files changed +24
-2
lines changed
lib/internal/Magento/Framework/Unserialize Expand file tree Collapse file tree 2 files changed +24
-2
lines changed Original file line number Diff line number Diff line change 5
5
*/
6
6
namespace Magento \Framework \Unserialize \Test \Unit ;
7
7
8
+ use Magento \Framework \Serialize \Serializer \Serialize ;
9
+
8
10
/**
9
11
* @package Magento\Framework
10
12
*/
@@ -15,7 +17,9 @@ class UnserializeTest extends \PHPUnit_Framework_TestCase
15
17
16
18
protected function setUp ()
17
19
{
18
- $ this ->unserialize = new \Magento \Framework \Unserialize \Unserialize ();
20
+ $ this ->unserialize = new \Magento \Framework \Unserialize \Unserialize (
21
+ new Serialize ()
22
+ );
19
23
}
20
24
21
25
public function testUnserializeArray ()
Original file line number Diff line number Diff line change 6
6
7
7
namespace Magento \Framework \Unserialize ;
8
8
9
+ use Magento \Framework \App \ObjectManager ;
10
+ use Magento \Framework \Serialize \Serializer \Serialize ;
11
+
9
12
/**
10
13
* @deprecated
11
14
*/
12
15
class Unserialize
13
16
{
17
+ /**
18
+ * Serializer for safe string unserialization.
19
+ *
20
+ * @var Serialize
21
+ */
22
+ private $ serializer ;
23
+
24
+ /**
25
+ * @param Serialize|null $serializer Optional parameter for backward compatibility.
26
+ */
27
+ public function __construct (Serialize $ serializer = null )
28
+ {
29
+ $ this ->serializer = $ serializer ?: ObjectManager::getInstance ()->get (Serialize::class);
30
+ }
31
+
14
32
/**
15
33
* @param string $string
16
34
* @return bool|mixed
@@ -21,6 +39,6 @@ public function unserialize($string)
21
39
trigger_error ('String contains serialized object ' );
22
40
return false ;
23
41
}
24
- return unserialize ($ string );
42
+ return $ this -> serializer -> unserialize ($ string );
25
43
}
26
44
}
You can’t perform that action at this time.
0 commit comments