[MediaWiki-commits] [Gerrit] integration/docroot[master]: Rename to cover-extensions/ to avoid issues with subdirectories

2018-01-04 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/402184 )

Change subject: Rename to cover-extensions/ to avoid issues with subdirectories
..


Rename to cover-extensions/ to avoid issues with subdirectories

Page is designed to work for top-level directories, subdirectories don't
really work. So just rename the directory to cover-extensions to make
the URL look like I want it, but work properly :)

Change-Id: If845635c6329b0e39b6f14145d41ee47908127f5
---
R org/wikimedia/doc/cover-extensions/dir.php
R org/wikimedia/doc/cover-extensions/index.php
M shared/CoveragePage.php
3 files changed, 3 insertions(+), 10 deletions(-)

Approvals:
  Legoktm: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/org/wikimedia/doc/cover/extensions/dir.php 
b/org/wikimedia/doc/cover-extensions/dir.php
similarity index 90%
rename from org/wikimedia/doc/cover/extensions/dir.php
rename to org/wikimedia/doc/cover-extensions/dir.php
index f31f804..879af75 100644
--- a/org/wikimedia/doc/cover/extensions/dir.php
+++ b/org/wikimedia/doc/cover-extensions/dir.php
@@ -17,13 +17,12 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-require_once __DIR__ . '/../../../../../shared/DocPage.php';
+require_once __DIR__ . '/../../../../shared/DocPage.php';
 
 $p = DocPage::newDirIndex(
'MediaWiki extension test coverage: ',
Page::INDEX_PREFIX | Page::INDEX_ALLOW_SKIP
 );
 $p->setRootDir( dirname( __DIR__ ) );
-$p->setLibPath( __DIR__ . '/../../lib' );
 $p->handleDirIndex();
 $p->flush();
diff --git a/org/wikimedia/doc/cover/extensions/index.php 
b/org/wikimedia/doc/cover-extensions/index.php
similarity index 86%
rename from org/wikimedia/doc/cover/extensions/index.php
rename to org/wikimedia/doc/cover-extensions/index.php
index 1af3043..dec1f54 100644
--- a/org/wikimedia/doc/cover/extensions/index.php
+++ b/org/wikimedia/doc/cover-extensions/index.php
@@ -18,13 +18,11 @@
  *
  */
 
-require_once __DIR__ . '/../../../../../shared/CoveragePage.php';
+require_once __DIR__ . '/../../../../shared/CoveragePage.php';
 
 /** @var CoveragePage $p */
 $p = CoveragePage::newDirIndex( 'MediaWiki extension test coverage' );
 $p->setCoverageDir( __DIR__ );
-// XXX: Not sure if there's a better way to do this
-$p->setLibPath( '../../lib' );
 $p->handleCoverageIndex();
 $p->handleDirIndex();
 $p->flush();
diff --git a/shared/CoveragePage.php b/shared/CoveragePage.php
index cd67474..01fad1d 100644
--- a/shared/CoveragePage.php
+++ b/shared/CoveragePage.php
@@ -157,11 +157,7 @@
$dirs = parent::getDirIndexDirectories();
$noClover = [];
foreach ( $dirs as $dir ) {
-   // Ignore "extensions" subdirectory, it is linked to
-   // separately
-   if ( !file_exists( "$dir/clover.xml" )
-   && basename( $dir ) !== 'extensions'
-   ) {
+   if ( !file_exists( "$dir/clover.xml" ) ) {
$noClover[] = $dir;
}
}

-- 
To view, visit https://gerrit.wikimedia.org/r/402184
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: If845635c6329b0e39b6f14145d41ee47908127f5
Gerrit-PatchSet: 1
Gerrit-Project: integration/docroot
Gerrit-Branch: master
Gerrit-Owner: Legoktm 
Gerrit-Reviewer: Hashar 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: Paladox 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] integration/docroot[master]: Rename to cover-extensions/ to avoid issues with subdirectories

2018-01-04 Thread Legoktm (Code Review) 
Legoktm has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/402184 )

Change subject: Rename to cover-extensions/ to avoid issues with subdirectories
..

Rename to cover-extensions/ to avoid issues with subdirectories

Page is designed to work for top-level directories, subdirectories don't
really work. So just rename the directory to cover-extensions to make
the URL look like I want it, but work properly :)

Change-Id: If845635c6329b0e39b6f14145d41ee47908127f5
---
R org/wikimedia/doc/cover-extensions/dir.php
R org/wikimedia/doc/cover-extensions/index.php
M shared/CoveragePage.php
3 files changed, 3 insertions(+), 10 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/integration/docroot 
refs/changes/84/402184/1

diff --git a/org/wikimedia/doc/cover/extensions/dir.php 
b/org/wikimedia/doc/cover-extensions/dir.php
similarity index 90%
rename from org/wikimedia/doc/cover/extensions/dir.php
rename to org/wikimedia/doc/cover-extensions/dir.php
index f31f804..879af75 100644
--- a/org/wikimedia/doc/cover/extensions/dir.php
+++ b/org/wikimedia/doc/cover-extensions/dir.php
@@ -17,13 +17,12 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-require_once __DIR__ . '/../../../../../shared/DocPage.php';
+require_once __DIR__ . '/../../../../shared/DocPage.php';
 
 $p = DocPage::newDirIndex(
'MediaWiki extension test coverage: ',
Page::INDEX_PREFIX | Page::INDEX_ALLOW_SKIP
 );
 $p->setRootDir( dirname( __DIR__ ) );
-$p->setLibPath( __DIR__ . '/../../lib' );
 $p->handleDirIndex();
 $p->flush();
diff --git a/org/wikimedia/doc/cover/extensions/index.php 
b/org/wikimedia/doc/cover-extensions/index.php
similarity index 86%
rename from org/wikimedia/doc/cover/extensions/index.php
rename to org/wikimedia/doc/cover-extensions/index.php
index 1af3043..dec1f54 100644
--- a/org/wikimedia/doc/cover/extensions/index.php
+++ b/org/wikimedia/doc/cover-extensions/index.php
@@ -18,13 +18,11 @@
  *
  */
 
-require_once __DIR__ . '/../../../../../shared/CoveragePage.php';
+require_once __DIR__ . '/../../../../shared/CoveragePage.php';
 
 /** @var CoveragePage $p */
 $p = CoveragePage::newDirIndex( 'MediaWiki extension test coverage' );
 $p->setCoverageDir( __DIR__ );
-// XXX: Not sure if there's a better way to do this
-$p->setLibPath( '../../lib' );
 $p->handleCoverageIndex();
 $p->handleDirIndex();
 $p->flush();
diff --git a/shared/CoveragePage.php b/shared/CoveragePage.php
index cd67474..01fad1d 100644
--- a/shared/CoveragePage.php
+++ b/shared/CoveragePage.php
@@ -157,11 +157,7 @@
$dirs = parent::getDirIndexDirectories();
$noClover = [];
foreach ( $dirs as $dir ) {
-   // Ignore "extensions" subdirectory, it is linked to
-   // separately
-   if ( !file_exists( "$dir/clover.xml" )
-   && basename( $dir ) !== 'extensions'
-   ) {
+   if ( !file_exists( "$dir/clover.xml" ) ) {
$noClover[] = $dir;
}
}

-- 
To view, visit https://gerrit.wikimedia.org/r/402184
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: If845635c6329b0e39b6f14145d41ee47908127f5
Gerrit-PatchSet: 1
Gerrit-Project: integration/docroot
Gerrit-Branch: master
Gerrit-Owner: Legoktm 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits