Loading code/generator/autoloadClassmap.php +1 −1 Changes for code/generator/autoloadClassmap.php: 1 added line, 1 removed line. Original line number Diff line number Diff line Loading @@ -12,7 +12,7 @@ return [ 'generator' => function (array $params) { $moduleName = $params['module']; $module = Util::introspection()->getModule($moduleName); $map = Util::introspection()->getClasses($module['namespace']); $map = Util::introspection()->getClasses(namespace: $module['namespace']); $mc = 0; foreach ($map as $c => $f) { Loading src/Console.php +1 −1 Changes for src/Console.php: 1 added line, 1 removed line. Original line number Diff line number Diff line Loading @@ -216,4 +216,4 @@ class Console { return utf8_encode(str_pad(utf8_decode($input), $padLength, $padString)); } }} No newline at end of file } No newline at end of file src/Form/FormMaker.php +1 −1 Changes for src/Form/FormMaker.php: 1 added line, 1 removed line. Original line number Diff line number Diff line Loading @@ -132,7 +132,7 @@ class FormMaker extends \Laminas\Form\Form public function addSelectEntity(string $name, string $label, ?string $namespace = null, ?string $value = null): self { $options = []; $entities = Util::introspection()->getDbEntities($namespace); $entities = Util::introspection()->getDbEntities(namespace: $namespace); ksort($entities); foreach ($entities as $entity) { Loading src/Service/IntrospectionService.php +207 −41 Changes for src/Service/IntrospectionService.php: 207 added lines, 41 removed lines. Original line number Diff line number Diff line Loading @@ -21,53 +21,225 @@ class IntrospectionService use ConfigServiceAwareTrait; public function getTraitParams(string $class): array { $params = [ 'class' => $class, 'aware' => false, ]; $rc = new \ReflectionClass($class); $filename = $rc->getFileName(); $module = Util::classModule($class, util::CLASS_MODULE_CONFIG); if (0 === strpos($filename, $module['absPath'])) { $filename = substr($filename, strlen($module['absPath'])); } $params['filename'] = $filename; $params['module'] = $module['name']; if (substr($class, -strlen('AwareTrait')) !== 'AwareTrait') { return $params; } else { $params['aware'] = true; $params['subDir'] = strpos($class, '\\Traits\\') !== false; } $ms = $rc->getMethods(); $params['getter'] = null; $params['setter'] = null; foreach ($ms as $m) { if (0 === strpos($m->getName(), 'get')) { $params['getter'] = $m->getName(); if ($m->getReturnType()) { $params['targetClass'] = $m->getReturnType()->getName(); } } elseif (0 === strpos($m->getName(), 'set')) { $params['setter'] = $m->getName(); } } $attrs = $rc->getProperties(); if (1 === count($attrs)) { $attr = $attrs[0]; $params['property'] = $attr->getName(); if (!isset($params['targetClass'])) { $type = $attr->getType(); if ($type) { $params['targetClass'] = $type->getName(); } } } if (!isset($params['targetClass'])) { $targetClass = substr($class, 0, -strlen('AwareTrait')); if ($params['subDir']) { $targetClass = str_replace('\\Traits\\', '\\', $targetClass); } if (class_exists($targetClass)) { $params['targetClass'] = $targetClass; } } if (!isset($params['targetClass'])) { $params['targetClass'] = null; } return $params; } public function getInterfaceParams(string $class): array { $params = [ 'class' => $class, 'aware' => false, ]; $rc = new \ReflectionClass($class); $filename = $rc->getFileName(); $module = Util::classModule($class, util::CLASS_MODULE_CONFIG); if (0 === strpos($filename, $module['absPath'])) { $filename = substr($filename, strlen($module['absPath'])); } $params['filename'] = $filename; $params['module'] = $module['name']; if (substr($class, -strlen('AwareInterface')) !== 'AwareInterface') { return $params; } else { $params['aware'] = true; $params['subDir'] = strpos($class, '\\Interfaces\\') !== false; } $ms = $rc->getMethods(); $params['getter'] = null; $params['setter'] = null; foreach ($ms as $m) { if (0 === strpos($m->getName(), 'get')) { $params['getter'] = $m->getName(); if ($m->getReturnType()) { $params['targetClass'] = $m->getReturnType()->getName(); } } elseif (0 === strpos($m->getName(), 'set')) { $params['setter'] = $m->getName(); } } if (!isset($params['targetClass'])) { $targetClass = substr($class, 0, -strlen('AwareInterface')); if ($params['subDir']) { $targetClass = str_replace('\\Interfaces\\', '\\', $targetClass); } if (class_exists($targetClass)) { $params['targetClass'] = $targetClass; } } if (!isset($params['targetClass'])) { $params['targetClass'] = null; } return $params; } /** * Retourne la liste des services accessibles depuis le ServiceManager et correspondant aux critères suivants : * Les chaînes retournées sont les noms de classe des services * * @param null|string $namespace Les classes retournées devront faire partie du namespace spécifié * @param null|string $rootClass Les classes retournées devront hériter de $rootClass si spécifié * @param bool $includeVendor Détermine si on veut aussi des entités venant du répertoire vendor ou bien uniquement de notre application * * @return string[] */ public function getServices(?string $namespace = null, ?string $rootClass = null) public function getServices(?string $namespace = null, bool $includeVendor = false): array { $manager = new ServiceManager(Util::getContainer()); $result = $manager->getClasses(); return $this->filterClasses($result, $namespace, $rootClass); return $this->filterClasses($result, $namespace, $includeVendor); } public function getClasses(?string $namespace = null, bool $includeVendor = false): array { $cti = $this->getCTI($namespace, $includeVendor); foreach ($cti as $k => $c) { if (!class_exists($c)) { unset($cti[$k]); } } return $cti; } public function getTraits(?string $namespace = null, bool $includeVendor = false): array { $cti = $this->getCTI($namespace, $includeVendor); foreach ($cti as $k => $t) { if (!trait_exists($t)) { unset($cti[$k]); } } return $cti; } public function getClasses(?string $namespace = null): array public function getInterfaces(?string $namespace = null, bool $includeVendor = false): array { $path = null; if ($namespace) { $module = Util::classModule($namespace, Util::CLASS_MODULE_CONFIG); if ($module) { $path = $module['absPath']; if ($module['namespace'] === $namespace){ $namespace = null; // on prend tout le module $cti = $this->getCTI($namespace, $includeVendor); foreach ($cti as $k => $i) { if (!interface_exists($i)) { unset($cti[$k]); } } return $cti; } private function getCTI(?string $namespace = null, bool $includeVendor = false): array { if ($namespace) $includeVendor = true; $path = getcwd(); if (!$includeVendor) { $path .= '/module'; } if (!$path) $path = getcwd(); $l = new \Laminas\File\ClassFileLocator($path); $mdl = strlen($path); $map = []; foreach ($l as $file) { $filename = $file->getPath() . '/' . $file->getFilename(); $filename = substr($filename, $mdl); foreach ($file->getClasses() as $class) { if (!$namespace || 0 === strpos($class, $namespace)) { $map[$class] = $filename; $ok = true; if (!$includeVendor) { $module = Util::classModule($class, Util::CLASS_MODULE_CONFIG); if (null === $module) { $ok = false; } else { $ok = !$module['inVendor']; } } if ($ok && (!$namespace || 0 === strpos($class, $namespace))) { $map[] = $class; } } } ksort($map); sort($map); return $map; } Loading Loading @@ -105,16 +277,16 @@ class IntrospectionService * Les chaînes retournées sont les noms de classe des aides de vues * * @param null|string $namespace Les classes retournées devront faire partie du namespace spécifié * @param null|string $rootClass Les classes retournées devront hériter de $rootClass si spécifié * @param bool $includeVendor Détermine si on veut aussi des entités venant du répertoire vendor ou bien uniquement de notre application * * @return string[] */ public function getViewHelpers(?string $namespace = null, ?string $rootClass = null): array public function getViewHelpers(?string $namespace = null, bool $includeVendor = false): array { $manager = new ViewHelperManager(Util::getContainer()); $result = $manager->getClasses(); return $this->filterClasses($result, $namespace, $rootClass); return $this->filterClasses($result, $namespace, $includeVendor); } Loading @@ -124,16 +296,16 @@ class IntrospectionService * Les chaînes retournées sont les noms de classe des services * * @param null|string $namespace Les classes retournées devront faire partie du namespace spécifié * @param null|string $rootClass Les classes retournées devront hériter de $rootClass si spécifié * @param bool $includeVendor Détermine si on veut aussi des entités venant du répertoire vendor ou bien uniquement de notre application * * @return string[] */ public function getForms(?string $namespace = null, ?string $rootClass = null): array public function getForms(?string $namespace = null, bool $includeVendor = false): array { $manager = new FormManager(Util::getContainer()); $result = $manager->getClasses(); return $this->filterClasses($result, $namespace, $rootClass); return $this->filterClasses($result, $namespace, $includeVendor); } Loading @@ -142,11 +314,11 @@ class IntrospectionService * Retourne la liste des entités utilisées par doctrine dans l'application * * @param null|string $namespace Les classes retournées devront faire partie du namespace spécifié * @param null|string $rootClass Les classes retournées devront hériter de $rootClass si spécifié * @param bool $includeVendor Détermine si on veut aussi des entités venant du répertoire vendor ou bien uniquement de notre application * * @return string[] */ public function getDbEntities(?string $namespace = null, ?string $rootClass = null): array public function getDbEntities(?string $namespace = null, bool $includeVendor = false): array { $result = []; $metas = Util::getEntityManager()->getMetadataFactory()->getAllMetadata(); Loading @@ -156,19 +328,12 @@ class IntrospectionService } asort($result); return $this->filterClasses($result, $namespace, $rootClass); return $this->filterClasses($result, $namespace, $includeVendor); } /** * @param array $services * @param string|null $namespace * @param string|null $rootClass * * @return array */ private function filterClasses(array $classes, ?string $namespace = null, ?string $rootClass = null): array private function filterClasses(array $classes, ?string $namespace = null, bool $includeVendor = false): array { if (substr($namespace, -1) !== '\\') { $namespace .= '\\'; Loading @@ -180,8 +345,9 @@ class IntrospectionService } } if ($rootClass) { if (!is_subclass_of($class, $rootClass)) { if ($includeVendor) { $module = Util::classModule($class, Util::CLASS_MODULE_CONFIG); if (isset($module['inVendor']) && !$module['inVendor']) { unset($classes[$name]); } } Loading @@ -205,11 +371,11 @@ class IntrospectionService * instance => instance du module (si nécessaire) * ] * * @param boolean $includeVendor inclue les modules du répertoire vendor ou non * @param bool $includeVendor inclue les modules du répertoire vendor ou non * * @return array */ public function getModules(bool $includeVendor = true) public function getModules(bool $includeVendor = false): array { $moduleManager = Util::getContainer()->get('ModuleManager'); /* @var $moduleManager ModuleManager */ Loading @@ -230,7 +396,7 @@ class IntrospectionService public function getModule(string $name) public function getModule(string $name): array { $moduleManager = Util::getContainer()->get('ModuleManager'); /* @var $moduleManager ModuleManager */ Loading src/Util.php +5 −0 Changes for src/Util.php: 5 added lines, 0 removed lines. Original line number Diff line number Diff line Loading @@ -564,6 +564,11 @@ class Util } } $entities = self::introspection()->getDbEntities(); if (isset($entities[$class])){ return 'Entity'; } return null; } Loading Loading
code/generator/autoloadClassmap.php +1 −1 Changes for code/generator/autoloadClassmap.php: 1 added line, 1 removed line. Original line number Diff line number Diff line Loading @@ -12,7 +12,7 @@ return [ 'generator' => function (array $params) { $moduleName = $params['module']; $module = Util::introspection()->getModule($moduleName); $map = Util::introspection()->getClasses($module['namespace']); $map = Util::introspection()->getClasses(namespace: $module['namespace']); $mc = 0; foreach ($map as $c => $f) { Loading
src/Console.php +1 −1 Changes for src/Console.php: 1 added line, 1 removed line. Original line number Diff line number Diff line Loading @@ -216,4 +216,4 @@ class Console { return utf8_encode(str_pad(utf8_decode($input), $padLength, $padString)); } }} No newline at end of file } No newline at end of file
src/Form/FormMaker.php +1 −1 Changes for src/Form/FormMaker.php: 1 added line, 1 removed line. Original line number Diff line number Diff line Loading @@ -132,7 +132,7 @@ class FormMaker extends \Laminas\Form\Form public function addSelectEntity(string $name, string $label, ?string $namespace = null, ?string $value = null): self { $options = []; $entities = Util::introspection()->getDbEntities($namespace); $entities = Util::introspection()->getDbEntities(namespace: $namespace); ksort($entities); foreach ($entities as $entity) { Loading
src/Service/IntrospectionService.php +207 −41 Changes for src/Service/IntrospectionService.php: 207 added lines, 41 removed lines. Original line number Diff line number Diff line Loading @@ -21,53 +21,225 @@ class IntrospectionService use ConfigServiceAwareTrait; public function getTraitParams(string $class): array { $params = [ 'class' => $class, 'aware' => false, ]; $rc = new \ReflectionClass($class); $filename = $rc->getFileName(); $module = Util::classModule($class, util::CLASS_MODULE_CONFIG); if (0 === strpos($filename, $module['absPath'])) { $filename = substr($filename, strlen($module['absPath'])); } $params['filename'] = $filename; $params['module'] = $module['name']; if (substr($class, -strlen('AwareTrait')) !== 'AwareTrait') { return $params; } else { $params['aware'] = true; $params['subDir'] = strpos($class, '\\Traits\\') !== false; } $ms = $rc->getMethods(); $params['getter'] = null; $params['setter'] = null; foreach ($ms as $m) { if (0 === strpos($m->getName(), 'get')) { $params['getter'] = $m->getName(); if ($m->getReturnType()) { $params['targetClass'] = $m->getReturnType()->getName(); } } elseif (0 === strpos($m->getName(), 'set')) { $params['setter'] = $m->getName(); } } $attrs = $rc->getProperties(); if (1 === count($attrs)) { $attr = $attrs[0]; $params['property'] = $attr->getName(); if (!isset($params['targetClass'])) { $type = $attr->getType(); if ($type) { $params['targetClass'] = $type->getName(); } } } if (!isset($params['targetClass'])) { $targetClass = substr($class, 0, -strlen('AwareTrait')); if ($params['subDir']) { $targetClass = str_replace('\\Traits\\', '\\', $targetClass); } if (class_exists($targetClass)) { $params['targetClass'] = $targetClass; } } if (!isset($params['targetClass'])) { $params['targetClass'] = null; } return $params; } public function getInterfaceParams(string $class): array { $params = [ 'class' => $class, 'aware' => false, ]; $rc = new \ReflectionClass($class); $filename = $rc->getFileName(); $module = Util::classModule($class, util::CLASS_MODULE_CONFIG); if (0 === strpos($filename, $module['absPath'])) { $filename = substr($filename, strlen($module['absPath'])); } $params['filename'] = $filename; $params['module'] = $module['name']; if (substr($class, -strlen('AwareInterface')) !== 'AwareInterface') { return $params; } else { $params['aware'] = true; $params['subDir'] = strpos($class, '\\Interfaces\\') !== false; } $ms = $rc->getMethods(); $params['getter'] = null; $params['setter'] = null; foreach ($ms as $m) { if (0 === strpos($m->getName(), 'get')) { $params['getter'] = $m->getName(); if ($m->getReturnType()) { $params['targetClass'] = $m->getReturnType()->getName(); } } elseif (0 === strpos($m->getName(), 'set')) { $params['setter'] = $m->getName(); } } if (!isset($params['targetClass'])) { $targetClass = substr($class, 0, -strlen('AwareInterface')); if ($params['subDir']) { $targetClass = str_replace('\\Interfaces\\', '\\', $targetClass); } if (class_exists($targetClass)) { $params['targetClass'] = $targetClass; } } if (!isset($params['targetClass'])) { $params['targetClass'] = null; } return $params; } /** * Retourne la liste des services accessibles depuis le ServiceManager et correspondant aux critères suivants : * Les chaînes retournées sont les noms de classe des services * * @param null|string $namespace Les classes retournées devront faire partie du namespace spécifié * @param null|string $rootClass Les classes retournées devront hériter de $rootClass si spécifié * @param bool $includeVendor Détermine si on veut aussi des entités venant du répertoire vendor ou bien uniquement de notre application * * @return string[] */ public function getServices(?string $namespace = null, ?string $rootClass = null) public function getServices(?string $namespace = null, bool $includeVendor = false): array { $manager = new ServiceManager(Util::getContainer()); $result = $manager->getClasses(); return $this->filterClasses($result, $namespace, $rootClass); return $this->filterClasses($result, $namespace, $includeVendor); } public function getClasses(?string $namespace = null, bool $includeVendor = false): array { $cti = $this->getCTI($namespace, $includeVendor); foreach ($cti as $k => $c) { if (!class_exists($c)) { unset($cti[$k]); } } return $cti; } public function getTraits(?string $namespace = null, bool $includeVendor = false): array { $cti = $this->getCTI($namespace, $includeVendor); foreach ($cti as $k => $t) { if (!trait_exists($t)) { unset($cti[$k]); } } return $cti; } public function getClasses(?string $namespace = null): array public function getInterfaces(?string $namespace = null, bool $includeVendor = false): array { $path = null; if ($namespace) { $module = Util::classModule($namespace, Util::CLASS_MODULE_CONFIG); if ($module) { $path = $module['absPath']; if ($module['namespace'] === $namespace){ $namespace = null; // on prend tout le module $cti = $this->getCTI($namespace, $includeVendor); foreach ($cti as $k => $i) { if (!interface_exists($i)) { unset($cti[$k]); } } return $cti; } private function getCTI(?string $namespace = null, bool $includeVendor = false): array { if ($namespace) $includeVendor = true; $path = getcwd(); if (!$includeVendor) { $path .= '/module'; } if (!$path) $path = getcwd(); $l = new \Laminas\File\ClassFileLocator($path); $mdl = strlen($path); $map = []; foreach ($l as $file) { $filename = $file->getPath() . '/' . $file->getFilename(); $filename = substr($filename, $mdl); foreach ($file->getClasses() as $class) { if (!$namespace || 0 === strpos($class, $namespace)) { $map[$class] = $filename; $ok = true; if (!$includeVendor) { $module = Util::classModule($class, Util::CLASS_MODULE_CONFIG); if (null === $module) { $ok = false; } else { $ok = !$module['inVendor']; } } if ($ok && (!$namespace || 0 === strpos($class, $namespace))) { $map[] = $class; } } } ksort($map); sort($map); return $map; } Loading Loading @@ -105,16 +277,16 @@ class IntrospectionService * Les chaînes retournées sont les noms de classe des aides de vues * * @param null|string $namespace Les classes retournées devront faire partie du namespace spécifié * @param null|string $rootClass Les classes retournées devront hériter de $rootClass si spécifié * @param bool $includeVendor Détermine si on veut aussi des entités venant du répertoire vendor ou bien uniquement de notre application * * @return string[] */ public function getViewHelpers(?string $namespace = null, ?string $rootClass = null): array public function getViewHelpers(?string $namespace = null, bool $includeVendor = false): array { $manager = new ViewHelperManager(Util::getContainer()); $result = $manager->getClasses(); return $this->filterClasses($result, $namespace, $rootClass); return $this->filterClasses($result, $namespace, $includeVendor); } Loading @@ -124,16 +296,16 @@ class IntrospectionService * Les chaînes retournées sont les noms de classe des services * * @param null|string $namespace Les classes retournées devront faire partie du namespace spécifié * @param null|string $rootClass Les classes retournées devront hériter de $rootClass si spécifié * @param bool $includeVendor Détermine si on veut aussi des entités venant du répertoire vendor ou bien uniquement de notre application * * @return string[] */ public function getForms(?string $namespace = null, ?string $rootClass = null): array public function getForms(?string $namespace = null, bool $includeVendor = false): array { $manager = new FormManager(Util::getContainer()); $result = $manager->getClasses(); return $this->filterClasses($result, $namespace, $rootClass); return $this->filterClasses($result, $namespace, $includeVendor); } Loading @@ -142,11 +314,11 @@ class IntrospectionService * Retourne la liste des entités utilisées par doctrine dans l'application * * @param null|string $namespace Les classes retournées devront faire partie du namespace spécifié * @param null|string $rootClass Les classes retournées devront hériter de $rootClass si spécifié * @param bool $includeVendor Détermine si on veut aussi des entités venant du répertoire vendor ou bien uniquement de notre application * * @return string[] */ public function getDbEntities(?string $namespace = null, ?string $rootClass = null): array public function getDbEntities(?string $namespace = null, bool $includeVendor = false): array { $result = []; $metas = Util::getEntityManager()->getMetadataFactory()->getAllMetadata(); Loading @@ -156,19 +328,12 @@ class IntrospectionService } asort($result); return $this->filterClasses($result, $namespace, $rootClass); return $this->filterClasses($result, $namespace, $includeVendor); } /** * @param array $services * @param string|null $namespace * @param string|null $rootClass * * @return array */ private function filterClasses(array $classes, ?string $namespace = null, ?string $rootClass = null): array private function filterClasses(array $classes, ?string $namespace = null, bool $includeVendor = false): array { if (substr($namespace, -1) !== '\\') { $namespace .= '\\'; Loading @@ -180,8 +345,9 @@ class IntrospectionService } } if ($rootClass) { if (!is_subclass_of($class, $rootClass)) { if ($includeVendor) { $module = Util::classModule($class, Util::CLASS_MODULE_CONFIG); if (isset($module['inVendor']) && !$module['inVendor']) { unset($classes[$name]); } } Loading @@ -205,11 +371,11 @@ class IntrospectionService * instance => instance du module (si nécessaire) * ] * * @param boolean $includeVendor inclue les modules du répertoire vendor ou non * @param bool $includeVendor inclue les modules du répertoire vendor ou non * * @return array */ public function getModules(bool $includeVendor = true) public function getModules(bool $includeVendor = false): array { $moduleManager = Util::getContainer()->get('ModuleManager'); /* @var $moduleManager ModuleManager */ Loading @@ -230,7 +396,7 @@ class IntrospectionService public function getModule(string $name) public function getModule(string $name): array { $moduleManager = Util::getContainer()->get('ModuleManager'); /* @var $moduleManager ModuleManager */ Loading
src/Util.php +5 −0 Changes for src/Util.php: 5 added lines, 0 removed lines. Original line number Diff line number Diff line Loading @@ -564,6 +564,11 @@ class Util } } $entities = self::introspection()->getDbEntities(); if (isset($entities[$class])){ return 'Entity'; } return null; } Loading