Skip to content

Commit b144de5

Browse files
bkdotcombkdotcom
committed
Merge branch '3.2'
* 3.2: Emailer: include REQUEST_METHOD Unit test fix Utility::gitBranch() issues with user/permissins... read .git/HEAD file instead UnitTest fix - (PHP-SOAP version not matching PHP_VERSION) UnitTest fix - (PHP-SOAP version not matching PHP_VERSION) github workflow - bump paambaati/codeclimate-action to v5.0.0 crate classDefinition (static property values may require abstraction) no longer add "overrides" classname (redundant to data-declared-prev) ErrorHandler\Error now contains "evalLine" (null unless error occurs within `eval`) logEntries for php errors, warn, error, clear, count (without label) add meta "evalLine" & data-evalLine varDump not escaping special chars Utility/Php::getIniFiles not properly handling empty return from `php_ini_scanned_files()` output phpDoc @throws tag info for methods "bump" default jQueryUrl to 3.7.1 Object abstractions now support deep inheritance change,(for now is simply the default -> class-definition -> instance values) New config options: methodStaticVarCollect & methodStaticVarOutput fix unit test objectSort config is now a space separated list with default value = "inheritance visibility name" Implements now stored as a structure that conveys interface inheritance What interfaces a method implements are now collected for every implemented interface (prev a select few such as ArrayAccess) Anonymous objects now collected & stored like other objects... collecting attribues, phpdoc, & interfaces in the process html output : * added <hr /> between summary and main log * now displays an icon on methods implementing an interface * no longer add "inherited" classname to methods/properties/constants (redundant to data-inherited-from attribute) * properties/methods now grouped by inheritance by default. (dependant on objectSort beginning with 'inheritance') - "inherited" icon not didplayed when groupbed by inheritance) * new "interfacesCollapse" config * new objectSectionOrder config. defaults to ['attributes', 'extends', 'implements', 'constants', 'cases', 'properties', 'methods', 'phpDoc'] HttpMessage\ServerRequest::fromGlobals() now has $parseStrOpts param HttpMessage\Uri::fromGlobals() is now a public static method
2 parents 6886d5e + bd1c206 commit b144de5

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

85 files changed

+1625
-826
lines changed

‎composer.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,9 +46,9 @@
4646
}
4747
},
4848
"replace": {
49-
"bdk/backtrace": "2.2",
49+
"bdk/backtrace": "2.2.1",
5050
"bdk/curl-http-message": "1.0",
51-
"bdk/errorhandler": "3.3.1",
51+
"bdk/errorhandler": "3.3.2",
5252
"bdk/http-message": "1.1",
5353
"bdk/promise": "1.0",
5454
"bdk/pubsub": "3.2.1",

‎src/Backtrace/Normalizer.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ class Normalizer
2020

2121
private static $frameDefault = array(
2222
'args' => array(),
23+
'evalLine' => null,
2324
'file' => null,
2425
'function' => null, // function, Class::function, or Class->function
2526
'line' => null,
@@ -42,7 +43,6 @@ public static function normalize($backtrace)
4243
'params' => null,
4344
'type' => null,
4445
);
45-
$frameKeysKeep = \array_merge(self::$frameDefault, \array_flip(array('evalLine')));
4646
$count = \count($backtrace);
4747
$backtrace[] = array(); // add a frame so backtrace[$i + 1] is always a thing
4848
for ($i = 0; $i < $count; $i++) {
@@ -59,7 +59,7 @@ public static function normalize($backtrace)
5959
// xdebug_get_function_stack
6060
$frame['args'] = self::normalizeXdebugParams($frame['params']);
6161
}
62-
$frame = \array_intersect_key($frame, $frameKeysKeep);
62+
$frame = \array_intersect_key($frame, self::$frameDefault);
6363
\ksort($frame);
6464
self::$backtraceTemp[] = $frame;
6565
}
@@ -89,8 +89,8 @@ private static function normalizeFrameFile(array $frame, array &$frameNext)
8989
// reported line = line within eval
9090
// line inside paren is the line `eval` is on
9191
$frame['evalLine'] = $frame['line'];
92-
$frame['line'] = (int) $matches[2];
9392
$frame['file'] = $matches[1];
93+
$frame['line'] = (int) $matches[2];
9494
if (isset($frameNext['include_filename'])) {
9595
// xdebug_get_function_stack puts the evaled code in include_filename
9696
$frameNext['params'] = array($frameNext['include_filename']);

‎src/Debug/Abstraction/AbstractObject.php‎

Lines changed: 53 additions & 69 deletions
Original file line numberDiff line numberDiff line change
@@ -26,54 +26,52 @@
2626
use ReflectionClass;
2727
use ReflectionEnumUnitCase;
2828
use RuntimeException;
29-
use UnitEnum;
3029

3130
/**
3231
* Abstracter: Methods used to abstract objects
3332
*/
3433
class AbstractObject extends AbstractComponent
3534
{
36-
// GENERAL
37-
const PHPDOC_COLLECT = 1; // 2^0
38-
const PHPDOC_OUTPUT = 2; // 2^1
39-
const OBJ_ATTRIBUTE_COLLECT = 4;
40-
const OBJ_ATTRIBUTE_OUTPUT = 8;
41-
const TO_STRING_OUTPUT = 16; // 2^4
4235
const BRIEF = 4194304; // 2^22
4336

44-
// CONSTANTS
45-
const CONST_COLLECT = 32;
46-
const CONST_OUTPUT = 64;
47-
const CONST_ATTRIBUTE_COLLECT = 128;
48-
const CONST_ATTRIBUTE_OUTPUT = 256; // 2^8
49-
50-
// CASE
37+
// CASE (2^9 - 2^12)
5138
const CASE_COLLECT = 512;
5239
const CASE_OUTPUT = 1024;
5340
const CASE_ATTRIBUTE_COLLECT = 2048;
54-
const CASE_ATTRIBUTE_OUTPUT = 4096; // 2^12
41+
const CASE_ATTRIBUTE_OUTPUT = 4096;
5542

56-
// PROPERTIES
57-
const PROP_ATTRIBUTE_COLLECT = 8192;
58-
const PROP_ATTRIBUTE_OUTPUT = 16384; // 2^14
43+
// CONSTANTS (2^5 - 2^8)
44+
const CONST_COLLECT = 32;
45+
const CONST_OUTPUT = 64;
46+
const CONST_ATTRIBUTE_COLLECT = 128;
47+
const CONST_ATTRIBUTE_OUTPUT = 256;
5948

60-
// METHODS
49+
// METHODS (2^15 - 2^21, 2^23 - 2^24)
6150
const METHOD_COLLECT = 32768;
6251
const METHOD_OUTPUT = 65536;
52+
const METHOD_DESC_OUTPUT = 524288;
6353
const METHOD_ATTRIBUTE_COLLECT = 131072;
6454
const METHOD_ATTRIBUTE_OUTPUT = 262144;
65-
const METHOD_DESC_OUTPUT = 524288;
55+
const METHOD_STATIC_VAR_COLLECT = 8388608; // 2^23
56+
const METHOD_STATIC_VAR_OUTPUT = 16777216; // 2^24
57+
58+
const OBJ_ATTRIBUTE_COLLECT = 4;
59+
const OBJ_ATTRIBUTE_OUTPUT = 8;
60+
6661
const PARAM_ATTRIBUTE_COLLECT = 1048576;
67-
const PARAM_ATTRIBUTE_OUTPUT = 2097152; // 2^21
62+
const PARAM_ATTRIBUTE_OUTPUT = 2097152;
63+
64+
const PHPDOC_COLLECT = 1; // 2^0
65+
const PHPDOC_OUTPUT = 2;
6866

69-
public static $cfgFlags = array( // @phpcs:ignore SlevomatCodingStandard.Arrays.AlphabeticallySortedByKeys.IncorrectKeyOrder
70-
// GENERAL
67+
// PROPERTIES (2^13 - 2^14)
68+
const PROP_ATTRIBUTE_COLLECT = 8192; // 2^13
69+
const PROP_ATTRIBUTE_OUTPUT = 16384; // 2^14
70+
71+
const TO_STRING_OUTPUT = 16; // 2^4
72+
73+
public static $cfgFlags = array(
7174
'brief' => self::BRIEF,
72-
'objAttributeCollect' => self::OBJ_ATTRIBUTE_COLLECT,
73-
'objAttributeOutput' => self::OBJ_ATTRIBUTE_OUTPUT,
74-
'phpDocCollect' => self::PHPDOC_COLLECT,
75-
'phpDocOutput' => self::PHPDOC_OUTPUT,
76-
'toStringOutput' => self::TO_STRING_OUTPUT,
7775

7876
// CASE
7977
'caseAttributeCollect' => self::CASE_ATTRIBUTE_COLLECT,
@@ -93,12 +91,23 @@ class AbstractObject extends AbstractComponent
9391
'methodCollect' => self::METHOD_COLLECT,
9492
'methodDescOutput' => self::METHOD_DESC_OUTPUT,
9593
'methodOutput' => self::METHOD_OUTPUT,
94+
'methodStaticVarCollect' => self::METHOD_STATIC_VAR_COLLECT,
95+
'methodStaticVarOutput' => self::METHOD_STATIC_VAR_OUTPUT,
96+
97+
'objAttributeCollect' => self::OBJ_ATTRIBUTE_COLLECT,
98+
'objAttributeOutput' => self::OBJ_ATTRIBUTE_OUTPUT,
99+
96100
'paramAttributeCollect' => self::PARAM_ATTRIBUTE_COLLECT,
97101
'paramAttributeOutput' => self::PARAM_ATTRIBUTE_OUTPUT,
98102

103+
'phpDocCollect' => self::PHPDOC_COLLECT,
104+
'phpDocOutput' => self::PHPDOC_OUTPUT,
105+
99106
// PROPERTIES
100107
'propAttributeCollect' => self::PROP_ATTRIBUTE_COLLECT,
101108
'propAttributeOutput' => self::PROP_ATTRIBUTE_OUTPUT,
109+
110+
'toStringOutput' => self::TO_STRING_OUTPUT,
102111
);
103112

104113
protected $abstracter;
@@ -137,32 +146,24 @@ class AbstractObject extends AbstractComponent
137146
*
138147
* @var array Array of key/values
139148
*/
140-
protected static $values = array( // phpcs:ignore SlevomatCodingStandard.Arrays.AlphabeticallySortedByKeys.IncorrectKeyOrder
141-
'type' => Abstracter::TYPE_OBJECT,
149+
protected static $values = array(
142150
'cfgFlags' => 0,
143151
'className' => '',
144152
'debugMethod' => '',
145-
'isAnonymous' => false,
153+
'interfacesCollapse' => array(), // cfg.interfacesCollapse
146154
'isExcluded' => false, // don't exclude if we're debugging directly
147155
'isMaxDepth' => false,
148156
'isRecursion' => false,
157+
// methods may be populated with __toString info, or methods with staticVars
149158
'properties' => array(),
150159
'scopeClass' => '',
160+
'sectionOrder' => array(), // cfg.objectSectionOrder
151161
'sort' => '', // cfg.objectSort
152162
'stringified' => null,
153163
'traverseValues' => array(), // populated if method is table
154164
'viaDebugInfo' => false,
155165
);
156166

157-
protected static $keysTemp = array(
158-
'collectPropertyValues',
159-
'fullyQualifyPhpDocType',
160-
'hist',
161-
'isTraverseOnly',
162-
'propertyOverrideValues',
163-
'reflector',
164-
);
165-
166167
/**
167168
* Constructor
168169
*
@@ -202,12 +203,12 @@ public function getAbstraction($obj, $method = null, array $hist = array())
202203
$reflector = $reflector->getEnum();
203204
}
204205
$values = $this->getAbstractionValues($reflector, $obj, $method, $hist);
205-
$valueStore = $this->definition->getValueStore($obj, $values);
206-
$abs = new ObjectAbstraction($valueStore, $values);
206+
$definitionValueStore = $this->definition->getAbstraction($obj, $values);
207+
$abs = new ObjectAbstraction($definitionValueStore, $values);
207208
$abs->setSubject($obj);
208209
$abs['hist'][] = $obj;
209210
$this->doAbstraction($abs);
210-
$this->absClean($abs);
211+
$abs->clean();
211212
return $abs;
212213
}
213214

@@ -233,21 +234,6 @@ public static function buildObjValues(array $values = array())
233234
);
234235
}
235236

236-
/**
237-
* Sort things and remove temporary values
238-
*
239-
* @param ObjectAbstraction $abs Abstraction instance
240-
*
241-
* @return void
242-
*/
243-
private function absClean(ObjectAbstraction $abs)
244-
{
245-
$values = \array_diff_key($abs->getInstanceValues(), \array_flip(self::$keysTemp));
246-
$abs
247-
->setSubject(null)
248-
->setValues($values);
249-
}
250-
251237
/**
252238
* Populate rows or columns (traverseValues) if we're outputing as a table
253239
*
@@ -268,9 +254,10 @@ private function addTraverseValues(ObjectAbstraction $abs)
268254
}
269255

270256
/**
271-
* Add attributes, constants, properties, methods, constants, etc
257+
* Collect instance info
258+
* Property values & static method variables
272259
*
273-
* @param ObjectAbstraction $abs Abstraction instance
260+
* @param ObjectAbstraction $abs Object abstraction instance
274261
*
275262
* @return void
276263
*/
@@ -280,11 +267,6 @@ private function doAbstraction(ObjectAbstraction $abs)
280267
return;
281268
}
282269
if ($abs['isRecursion']) {
283-
if ($abs->getSubject() instanceof UnitEnum) {
284-
$abs['properties']['name'] = array(
285-
'value' => $abs->getSubject()->name,
286-
);
287-
}
288270
return;
289271
}
290272
$abs['isTraverseOnly'] = $this->isTraverseOnly($abs);
@@ -304,15 +286,16 @@ private function doAbstraction(ObjectAbstraction $abs)
304286
if ($abs['isTraverseOnly']) {
305287
$this->addTraverseValues($abs);
306288
}
307-
$this->properties->add($abs);
289+
$this->methods->addInstance($abs); // method static variables
290+
$this->properties->addInstance($abs);
308291
/*
309292
Debug::EVENT_OBJ_ABSTRACT_END subscriber has free reign to modify abtraction values
310293
*/
311294
$this->debug->publishBubbleEvent(Debug::EVENT_OBJ_ABSTRACT_END, $abs, $this->debug);
312295
}
313296

314297
/**
315-
* Returns information about an object
298+
* Get initial "top-level" values.
316299
*
317300
* @param ReflectionClass $reflector Reflection instance
318301
* @param object|string $obj Object (or classname) to inspect
@@ -330,11 +313,12 @@ protected function getAbstractionValues(ReflectionClass $reflector, $obj, $metho
330313
'cfgFlags' => $this->getCfgFlags(),
331314
'className' => $this->helper->getClassName($reflector),
332315
'debugMethod' => $method,
333-
'isAnonymous' => PHP_VERSION_ID >= 70000 && $reflector->isAnonymous(),
316+
'interfacesCollapse' => \array_values(\array_intersect($reflector->getInterfaceNames(), $this->cfg['interfacesCollapse'])),
334317
'isExcluded' => $hist && $this->isExcluded($obj), // don't exclude if we're debugging directly
335318
'isMaxDepth' => $this->cfg['maxDepth'] && \count($hist) === $this->cfg['maxDepth'],
336319
'isRecursion' => \in_array($obj, $hist, true),
337320
'scopeClass' => $this->getScopeClass($hist),
321+
'sectionOrder' => $this->cfg['objectSectionOrder'],
338322
'sort' => $this->cfg['objectSort'],
339323
'viaDebugInfo' => $this->cfg['useDebugInfo'] && $reflector->hasMethod('__debugInfo'),
340324
),
@@ -355,7 +339,7 @@ protected function getAbstractionValues(ReflectionClass $reflector, $obj, $metho
355339
*
356340
* @return int bitmask
357341
*/
358-
private function getCfgFlags()
342+
protected function getCfgFlags()
359343
{
360344
$flagVals = \array_intersect_key(self::$cfgFlags, \array_filter($this->cfg));
361345
$bitmask = \array_reduce($flagVals, static function ($carry, $val) {

‎src/Debug/Abstraction/Abstracter.php‎

Lines changed: 28 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -74,12 +74,30 @@ class Abstracter extends AbstractComponent
7474
protected $cfg = array(
7575
'brief' => false, // collect & output less details
7676
'fullyQualifyPhpDocType' => false,
77+
'interfacesCollapse' => array(
78+
'ArrayAccess',
79+
'BackedEnum',
80+
'Countable',
81+
'Iterator',
82+
'IteratorAggregate',
83+
'UnitEnum',
84+
),
7785
'maxDepth' => 0, // value < 1 : no max-depth
86+
'objectSectionOrder' => array(
87+
'attributes',
88+
'extends',
89+
'implements',
90+
'constants',
91+
'cases',
92+
'properties',
93+
'methods',
94+
'phpDoc',
95+
),
7896
'objectsExclude' => array(
7997
// __NAMESPACE__ added in constructor
8098
'DOMNode',
8199
),
82-
'objectSort' => 'visibility', // none, visibility, or name
100+
'objectSort' => 'inheritance visibility name',
83101
'objectsWhitelist' => null, // will be used if array
84102
'stringMaxLen' => array(
85103
'base64' => 156, // 2 lines of chunk_split'ed
@@ -470,22 +488,25 @@ protected function postSetCfg($cfg = array(), $prev = array())
470488
$debugClass = \get_class($this->debug);
471489
if (!\array_intersect(array('*', $debugClass), $this->cfg['objectsExclude'])) {
472490
$this->cfg['objectsExclude'][] = $debugClass;
473-
$cfg['objectsExclude'] = $this->cfg['objectsExclude'];
474491
}
475492
if (isset($cfg['stringMaxLen'])) {
476493
if (\is_array($cfg['stringMaxLen']) === false) {
477494
$cfg['stringMaxLen'] = array(
478495
'other' => $cfg['stringMaxLen'],
479496
);
480497
}
481-
$cfg['stringMaxLen'] = \array_merge($prev['stringMaxLen'], $cfg['stringMaxLen']);
482-
$this->cfg['stringMaxLen'] = $cfg['stringMaxLen'];
498+
$this->cfg['stringMaxLen'] = \array_merge($prev['stringMaxLen'], $cfg['stringMaxLen']);
483499
}
484500
if (isset($cfg['stringMinLen'])) {
485-
$cfg['stringMinLen'] = \array_merge($prev['stringMinLen'], $cfg['stringMinLen']);
486-
$this->cfg['stringMinLen'] = $cfg['stringMinLen'];
501+
$this->cfg['stringMinLen'] = \array_merge($prev['stringMinLen'], $cfg['stringMinLen']);
502+
}
503+
if (isset($cfg['objectSectionOrder'])) {
504+
$oso = \array_intersect($cfg['objectSectionOrder'], $prev['objectSectionOrder']);
505+
$oso = \array_merge($oso, $prev['objectSectionOrder']);
506+
$oso = \array_unique($oso);
507+
$this->cfg['objectSectionOrder'] = $oso;
487508
}
488-
$this->setCfgDependencies($cfg);
509+
$this->setCfgDependencies(\array_intersect_key($this->cfg, $cfg));
489510
}
490511

491512
/**

0 commit comments

Comments
 (0)