htaccess

.htaccess

@@ -1,9 +1,6 @@
 Options +FollowSymLinks
 
 # BEGIN WordPress
-# The directives (lines) between `BEGIN WordPress` and `END WordPress` are
-# dynamically generated, and should only be modified via WordPress filters.
-# Any changes to the directives between these markers will be overwritten.
 <IfModule mod_rewrite.c>
 RewriteEngine On
 RewriteBase /wp/
@@ -12,9 +9,19 @@ RewriteCond %{REQUEST_FILENAME} !-f
 RewriteCond %{REQUEST_FILENAME} !-d
 RewriteRule . /wp/index.php [L]
 </IfModule>
-
 # END WordPress
 
+#### Use /wp/ subdirectory ####
+
+<IfModule mod_rewrite.c>
+	RewriteEngine On
+	RewriteBase /
+	RewriteRule ^(wp-admin/.*)$ /wp/$1 [L]
+	RewriteRule ^(wp-[^/]+\.php)$ /wp/$1 [L]
+	RewriteRule ^xmlrpc\.php$ /wp/xmlrpc.php [L]
+	RewriteRule ^(wp-includes/.*)$ /wp/$1 [L]
+</IfModule>
+
 #### Force SSL ####
 	#RewriteEngine On
 	#RewriteCond %{HTTPS} !=on

phpunit.xml.dist

@@ -1,28 +1,77 @@
 <phpunit
-	bootstrap="tests/phpunit/includes/bootstrap.php"
-        backupGlobals="false"
-        colors="true"
-        >
-    <testsuites>
-        <!-- Default test suite to run all tests -->
-        <testsuite>
-            <directory suffix=".php">tests/phpunit/tests</directory>
-            <exclude>tests/phpunit/tests/actions/closures.php</exclude>
-            <exclude>tests/phpunit/tests/image/editor.php</exclude>
-            <exclude>tests/phpunit/tests/image/editor_gd.php</exclude>
-            <exclude>tests/phpunit/tests/image/editor_imagick.php</exclude>
-            <file phpVersion="5.3.0">tests/phpunit/tests/actions/closures.php</file>
-            <file phpVersion="5.3.0">tests/phpunit/tests/image/editor.php</file>
-            <file phpVersion="5.3.0">tests/phpunit/tests/image/editor_gd.php</file>
-            <file phpVersion="5.3.0">tests/phpunit/tests/image/editor_imagick.php</file>
-        </testsuite>
-    </testsuites>
-    <groups>
-        <exclude>
-            <group>ajax</group>
-        </exclude>
-    </groups>
-    <logging>
-        <log type="junit" target="tests/phpunit/build/logs/junit.xml" logIncompleteSkipped="false"/>
-    </logging>
-</phpunit>
+		bootstrap="tests/phpunit/includes/bootstrap.php"
+		backupGlobals="false"
+		colors="true"
+		beStrictAboutTestsThatDoNotTestAnything="true"
+		>
+	<testsuites>
+		<!-- Default test suite to run all tests. -->
+		<testsuite name="default">
+			<directory suffix=".php">tests/phpunit/tests</directory>
+			<exclude>tests/phpunit/tests/rest-api/rest-autosaves-controller.php</exclude>
+		</testsuite>
+		<!-- Sets the DOING_AUTOSAVE constant, so needs to be run last. -->
+		<testsuite name="restapi-autosave">
+			<file>tests/phpunit/tests/rest-api/rest-autosaves-controller.php</file>
+		</testsuite>
+	</testsuites>
+	<groups>
+		<exclude>
+			<group>ajax</group>
+			<group>ms-files</group>
+			<group>ms-required</group>
+			<group>external-http</group>
+		</exclude>
+	</groups>
+	<logging>
+		<log type="junit" target="tests/phpunit/build/logs/junit.xml" />
+	</logging>
+	<php>
+		<const name="WP_RUN_CORE_TESTS" value="1" />
+	</php>
+	<listeners>
+		<listener class="SpeedTrapListener" file="tests/phpunit/includes/listener-loader.php">
+			<arguments>
+				<array>
+					<element key="slowThreshold">
+						<integer>150</integer>
+					</element>
+				</array>
+			</arguments>
+		</listener>
+	</listeners>
+	<filter>
+		<whitelist addUncoveredFilesFromWhitelist="true">
+			<directory suffix=".php">src</directory>
+			<exclude>
+				<!-- Third party library exclusions. -->
+				<directory suffix=".php">src/wp-includes/ID3</directory>
+				<directory suffix=".php">src/wp-includes/IXR</directory>
+				<directory suffix=".php">src/wp-includes/random_compat</directory>
+				<directory suffix=".php">src/wp-includes/Requests</directory>
+				<directory suffix=".php">src/wp-includes/SimplePie</directory>
+				<directory suffix=".php">src/wp-includes/Text</directory>
+
+				<file>src/wp-admin/includes/class-ftp*</file>
+				<file>src/wp-admin/includes/class-pclzip.php</file>
+				<file>src/wp-admin/includes/deprecated.php</file>
+				<file>src/wp-admin/includes/ms-deprecated.php</file>
+
+				<file>src/wp-includes/atomlib.php</file>
+				<file>src/wp-includes/class-IXR.php</file>
+				<file>src/wp-includes/class-json.php</file>
+				<file>src/wp-includes/class-phpass.php</file>
+				<file>src/wp-includes/class-phpmailer.php</file>
+				<file>src/wp-includes/class-pop3.php</file>
+				<file>src/wp-includes/class-requests.php</file>
+				<file>src/wp-includes/class-simplepie.php</file>
+				<file>src/wp-includes/class-smtp.php</file>
+				<file>src/wp-includes/class-snoopy.php</file>
+				<file>src/wp-includes/deprecated.php</file>
+				<file>src/wp-includes/ms-deprecated.php</file>
+				<file>src/wp-includes/pluggable-deprecated.php</file>
+				<file>src/wp-includes/rss.php</file>
+			</exclude>
+		</whitelist>
+	</filter>
+</phpunit>