Merge branch 'master' into v6-upgrade-guide

humanmade · Jan 6, 2021 · 3d41685 · 3d41685
2 parents 26c540e + 19711c5
commit 3d41685
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git a/inc/class-markdownparser.php b/inc/class-markdownparser.php
@@ -100,7 +100,7 @@ protected function inlineLink( $data ) {
 		if ( ! empty( $parts['scheme'] ) ) {
 			$new_url = convert_internal_link( $href );
 
-			// Allow shortcircuiting (e.g. for public display)
+			// Allow shortcircuiting (e.g. for public display).
 			if ( $new_url === null ) {
 				$result['element']['name'] = 'span';
 				$result['element']['attributes'] = [];

diff --git a/inc/namespace.php b/inc/namespace.php
@@ -129,7 +129,11 @@ function add_docs_for_group( Group $group, string $doc_dir ) : Group {
 	// Generate objects for each file.
 	$iterator = new DirectoryIterator( $doc_dir );
 	foreach ( $iterator as $leaf ) {
-		/** @var \SplFileInfo $leaf */
+		/**
+		 * Current iterator file object.
+		 *
+		 * @var \SplFileInfo $leaf
+		 */
 		if ( $leaf->isDir() ) {
 			if ( $leaf->isDot() ) {
 				continue;
@@ -175,7 +179,11 @@ function get_page_for_dir( string $dir, string $root_dir ) : ?Page {
 
 	$iterator = new DirectoryIterator( $dir );
 	foreach ( $iterator as $leaf ) {
-		/** @var \SplFileInfo $leaf */
+		/**
+		 * Current iterator file object.
+		 *
+		 * @var \SplFileInfo $leaf
+		 */
 		if ( $leaf->isDir() ) {
 			if ( $leaf->isDot() ) {
 				continue;