Skip to content

Commit 6e5597a

Browse files
committed
AC-2855::Removed overriden methods and now interceptor will not override core inbuilt methods by default unless explicitly first overriden by Magento class
1 parent 10f7989 commit 6e5597a

File tree

3 files changed

+1
-399
lines changed

3 files changed

+1
-399
lines changed

app/code/Magento/Backend/Model/Menu.php

Lines changed: 0 additions & 200 deletions
Original file line numberDiff line numberDiff line change
@@ -318,204 +318,4 @@ public function populateFromArray(array $data)
318318
}
319319
$this->exchangeArray($items);
320320
}
321-
322-
// Need to override and suppress return type deprecation warnings for php8 compatibility
323-
324-
/**
325-
* @inheritDoc
326-
* phpcs:disable Generic.CodeAnalysis.UselessOverridingMethod
327-
*/
328-
public function offsetExists($key): bool
329-
{
330-
return parent::offsetExists($key);
331-
}
332-
333-
/**
334-
* @inheritDoc
335-
*/
336-
#[\ReturnTypeWillChange]
337-
public function offsetGet($key)
338-
{
339-
return parent::offsetGet($key);
340-
}
341-
342-
/**
343-
* @inheritDoc
344-
*/
345-
#[\ReturnTypeWillChange]
346-
public function offsetSet($key, $value)
347-
{
348-
parent::offsetSet($key, $value);
349-
}
350-
351-
/**
352-
* @inheritDoc
353-
*/
354-
#[\ReturnTypeWillChange]
355-
public function offsetUnset($key)
356-
{
357-
parent::offsetUnset($key);
358-
}
359-
360-
/**
361-
* @inheritDoc
362-
*/
363-
public function count(): int
364-
{
365-
return parent::count();
366-
}
367-
368-
/**
369-
* @inheritDoc
370-
*/
371-
#[\ReturnTypeWillChange]
372-
public function append($value)
373-
{
374-
parent::append($value);
375-
}
376-
377-
/**
378-
* @inheritDoc
379-
*/
380-
public function getArrayCopy(): array
381-
{
382-
return parent::getArrayCopy();
383-
}
384-
385-
/**
386-
* @inheritDoc
387-
*/
388-
public function getFlags(): int
389-
{
390-
return parent::getFlags();
391-
}
392-
393-
/**
394-
* @inheritDoc
395-
*/
396-
#[\ReturnTypeWillChange]
397-
public function setFlags($flags)
398-
{
399-
parent::setFlags($flags);
400-
}
401-
402-
/**
403-
* @inheritDoc
404-
*
405-
* @phpstan-return void
406-
*/
407-
#[\ReturnTypeWillChange]
408-
public function asort($flags = SORT_REGULAR)
409-
{
410-
parent::asort($flags);
411-
}
412-
413-
/**
414-
* @inheritDoc
415-
*
416-
* @phpstan-return void
417-
*/
418-
#[\ReturnTypeWillChange]
419-
public function ksort($flags = SORT_REGULAR)
420-
{
421-
parent::ksort($flags);
422-
}
423-
424-
/**
425-
* @inheritDoc
426-
*/
427-
#[\ReturnTypeWillChange]
428-
public function uasort($callback)
429-
{
430-
parent::uasort($callback);
431-
}
432-
433-
/**
434-
* @inheritDoc
435-
*/
436-
#[\ReturnTypeWillChange]
437-
public function uksort($callback)
438-
{
439-
parent::uksort($callback);
440-
}
441-
442-
/**
443-
* @inheritDoc
444-
*/
445-
public function exchangeArray($array): array
446-
{
447-
return parent::exchangeArray($array);
448-
}
449-
450-
/**
451-
* @inheritDoc
452-
*/
453-
#[\ReturnTypeWillChange]
454-
public function setIteratorClass($iteratorClass)
455-
{
456-
parent::setIteratorClass($iteratorClass);
457-
}
458-
459-
/**
460-
* @inheritDoc
461-
*
462-
* @phpstan-return void
463-
*/
464-
#[\ReturnTypeWillChange]
465-
public function natsort()
466-
{
467-
parent::natsort();
468-
}
469-
470-
/**
471-
* @inheritDoc
472-
*
473-
* @phpstan-return void
474-
*/
475-
#[\ReturnTypeWillChange]
476-
public function natcasesort()
477-
{
478-
parent::natcasesort();
479-
}
480-
481-
/**
482-
* @inheritDoc
483-
*/
484-
public function __serialize(): array
485-
{
486-
return parent::__serialize();
487-
}
488-
489-
/**
490-
* @inheritDoc
491-
*/
492-
#[\ReturnTypeWillChange]
493-
public function __unserialize(array $data)
494-
{
495-
parent::__unserialize($data);
496-
}
497-
498-
/**
499-
* @inheritDoc
500-
*/
501-
public function getIterator(): \ArrayIterator
502-
{
503-
return parent::getIterator();
504-
}
505-
506-
/**
507-
* @inheritDoc
508-
*/
509-
public function getIteratorClass(): string
510-
{
511-
return parent::getIteratorClass();
512-
}
513-
514-
/**
515-
* @inheritDoc
516-
*/
517-
public function __debugInfo(): array
518-
{
519-
return parent::__debugInfo();
520-
}
521321
}

lib/internal/Magento/Framework/Interception/Code/Generator/Interceptor.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ protected function _getClassMethods()
7272
$reflectionClass = new \ReflectionClass($this->getSourceClassName());
7373
$publicMethods = $reflectionClass->getMethods(\ReflectionMethod::IS_PUBLIC);
7474
foreach ($publicMethods as $method) {
75-
if ($this->isInterceptedMethod($method)) {
75+
if (!$method->isInternal() && $this->isInterceptedMethod($method)) {
7676
$methods[] = $this->_getMethodInfo($method);
7777
}
7878
}

0 commit comments

Comments
 (0)