Skip to content

Commit 341e5ab

Browse files
kikmak42kikmak42
committed
Refactor Mapper to util
1 parent 0027afa commit 341e5ab

5 files changed

Lines changed: 32 additions & 27 deletions

File tree

‎lib/net/authorize/api/controller/base/ApiOperationBase.php‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,8 @@ public function execute($endPoint = \net\authorize\api\constants\ANetEnvironment
117117
//$requestArray = [lcfirst((new \ReflectionClass($this->apiRequest))->getShortName()) => $this->apiRequest];
118118

119119
// $requestRoot = (new \net\authorize\api\contract\v1\Mapper)->getXmlName((new \ReflectionClass($this->apiRequest))->getName());
120-
$requestRoot = (\net\authorize\api\contract\v1\Mapper::Instance())->getXmlName((new \ReflectionClass($this->apiRequest))->getName());
120+
// $requestRoot = (\net\authorize\api\contract\v1\Mapper::Instance())->getXmlName((new \ReflectionClass($this->apiRequest))->getName());
121+
$requestRoot = (\net\authorize\util\Mapper::Instance())->getXmlName((new \ReflectionClass($this->apiRequest))->getName());
121122

122123
$requestArray = [$requestRoot => $this->apiRequest];
123124

lib/net/authorize/api/contract/v1/Mapper.php renamed to lib/net/authorize/util/Mapper.php

Lines changed: 25 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,31 @@
11
<?php
2-
namespace net\authorize\api\contract\v1;
3-
use Symfony\Component\Yaml\Yaml;
2+
namespace net\authorize\util;
43

54
class Mapper{
65
private $classes = array();
7-
private $dir = __DIR__ . "/../../yml/v1/";
6+
// private $dir = __DIR__ . "/../../yml/v1/";
87

8+
// private function __construct() {
9+
// $files = scandir($this->dir);
10+
// foreach ($files as $file) {
11+
// // echo "filename:" . $file . "\n";
12+
// // Elementing the ..
13+
// if($file != "." && $file != ".." ){
14+
// $value = Yaml::parseFile($this->dir.$file);
15+
// //var_dump($value);
16+
// //array_push($classes, $value);
17+
// //var_dump($classes);
18+
// //echo $value['net\authorize\api\contract\v1\ANetApiRequestType']['properties']['merchantAuthentication']['type']."\n";
19+
// $key = key($value);
20+
// $this->classes[$key] = $value[$key];
21+
// //break;
22+
// }
23+
// }
24+
// }
925
private function __construct() {
10-
$files = scandir($this->dir);
11-
foreach ($files as $file) {
12-
// echo "filename:" . $file . "\n";
13-
// Elementing the ..
14-
if($file != "." && $file != ".." ){
15-
$value = Yaml::parseFile($this->dir.$file);
16-
//var_dump($value);
17-
//array_push($classes, $value);
18-
//var_dump($classes);
19-
//echo $value['net\authorize\api\contract\v1\ANetApiRequestType']['properties']['merchantAuthentication']['type']."\n";
20-
$key = key($value);
21-
$this->classes[$key] = $value[$key];
22-
//break;
23-
}
24-
}
26+
$this->classes = json_decode(file_get_contents(__DIR__ ."/classes.json"), true);
2527
}
26-
28+
2729
public static function Instance()
2830
{
2931
static $inst = null;
@@ -79,7 +81,7 @@ public function getClass(string $class, string $property){
7981
}
8082
$obj->className = $className;
8183
$obj->isCustomDefined = stripos($className, '\\') !== false;
82-
84+
8385
return $obj;
8486
}
8587
else if(get_parent_class($class)){
@@ -90,7 +92,7 @@ public function getClass(string $class, string $property){
9092
// return 'string';
9193
// }
9294
// else if ($property == "messages" ){
93-
//
95+
//
9496
// $className = 'net\authorize\api\contract\v1\MessagesType';
9597
// $obj->className = $className;
9698
// $obj->isCustomDefined = stripos($className, '\\') !== false;
@@ -104,11 +106,11 @@ public function getClass(string $class, string $property){
104106
}
105107
// return $this->classes[$classname]['properties'][$property]['type'];
106108
}
107-
109+
108110
public function getXmlName(string $class){
109111
if(isset($this->classes[$class]['xml_root_name'])){
110112
return $this->classes[$class]['xml_root_name'];
111-
}
113+
}
112114
}
113115
}
114116
//echo $classes['net\authorize\api\contract\v1\ANetApiRequestType']['properties']['merchantAuthentication']['type']."\n";

lib/net/authorize/api/contract/v1/MapperObj.php renamed to lib/net/authorize/util/MapperObj.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?php
2-
namespace net\authorize\api\contract\v1;
2+
namespace net\authorize\util;
33

44
class MapperObj{
55

‎scripts/appendJsonSeralizeCode.txt‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,8 @@
77
// echo __CLASS__ . "\n";
88
foreach($values as $key => $value){
99
//$classDetails = (new \net\authorize\api\contract\v1\Mapper)->getClass(get_class() , $key);
10-
$classDetails = (\net\authorize\api\contract\v1\Mapper::Instance())->getClass(get_class() , $key);
10+
//$classDetails = (\net\authorize\api\contract\v1\Mapper::Instance())->getClass(get_class() , $key);
11+
$classDetails = (\net\authorize\util\Mapper::Instance())->getClass(get_class() , $key);
1112
if (isset($value)){
1213
//$classDetails = (new \net\authorize\api\contract\v1\Mapper)->getClass(get_class() , $key);
1314
if ($classDetails->className === 'Date'){

‎scripts/appendSetCode.txt‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,8 @@
55
//$isarray = false;
66
//$classname = (new net\authorize\api\contract\v1\Mapper)->getClass(get_class() , $key);
77
//$classDetails = (new \net\authorize\api\contract\v1\Mapper)->getClass(get_class() , $key);
8-
$classDetails = (\net\authorize\api\contract\v1\Mapper::Instance())->getClass(get_class() , $key);
8+
//$classDetails = (\net\authorize\api\contract\v1\Mapper::Instance())->getClass(get_class() , $key);
9+
$classDetails = (\net\authorize\util\Mapper::Instance())->getClass(get_class() , $key);
910
//if (substr($classname, 0, 5) === "array") {
1011
// $classname = ltrim($classname, 'array<');
1112
// $classname = rtrim($classname, '>');

0 commit comments

Comments
 (0)