README.md

@@ -22,3 +22,6 @@ git archive --prefix=wp-content/themes/enfold-child/ -o hg-enfold-theme.zip HEAD
 lib/error-dumper is geschreven door Bart?omiej Krukowski, en
 wordt alleen gebruikt wanneer Wordpress in debug mode draait.
 Zie het bestand lib/error-dumper/COPYING voor details.
+
+lib/Autoloader.php is geschreven door Paul Garvin, voor meer
+informatie zie het commentaar blok bovenaan het bestand zelf.

assets/avia.js

@@ -50,7 +50,7 @@
 		(function() {
 			var shopmenu = $('div.shopmenu')
 
-			$('#menu-item-273').hover(
+			$('#menu-item-332').hover(
 				function() { shopmenu.removeClass('hidez') },
 				function() { }
 			)
@@ -58,6 +58,36 @@
 				function() { },
 				function() { shopmenu.addClass('hidez') }
 			)
+
+			var elCheckout = document.getElementById("checkout")
+			if (null != elCheckout) {
+				var shipments = new Array(2)
+				var payments  = new Array(2)
+				var tmp = $(elCheckout).find("label>input.shipmethod")
+
+				shipments[0] = tmp.first()
+				shipments[1] = tmp.last()
+
+				tmp = $(elCheckout).find("label>input[name='paymethod']")
+
+				payments[0] = tmp.first()
+				payments[1] = tmp.last()
+
+				payments[0].change(function() {
+					shipments[1].prop("checked", true)
+				})
+				payments[1].change(function() {
+					shipments[0].prop("checked", true)
+				})
+				shipments[0].change(function() {
+					payments[1].prop("checked", true)
+				})
+				shipments[1].change(function() {
+					payments[0].prop("checked", true)
+				})
+
+				payments[1].parent().append(" (verzending)")
+			}
 		})()
 
 

functions.php

@@ -40,14 +40,10 @@ add_theme_support('avia_template_builder_custom_css');
 
 namespace ITSociaal\Themes\Houtgrutter
 {
-	/*tell flexweb to use @#%PHP5.6
 	const LIBDIR = __DIR__ . "/lib";
-	const SRCDIR = __DIR__ . "/src";*/
+	const SRCDIR = __DIR__ . "/src";
 
-	define("HOUTGRUTTER_LIBDIR", __DIR__ . "/lib");
-	define("HOUTGRUTTER_SRCDIR", __DIR__ . "/src");
-
-	require_once HOUTGRUTTER_LIBDIR . '/Autoloader.php';
+	require_once LIBDIR . '/Autoloader.php';
 	class_alias("Paulyg\\Autoloader", __NAMESPACE__ . "\\Autoloader");
 
 	function do_autoloader($namespaces)
@@ -75,8 +71,8 @@ namespace ITSociaal\Themes\Houtgrutter
 	}
 
 	do_autoloader([
-		[__NAMESPACE__, HOUTGRUTTER_SRCDIR],
-		["ErrorDumper", HOUTGRUTTER_LIBDIR . "/error-dumper/src"],
+		[__NAMESPACE__, SRCDIR],
+		["ErrorDumper", LIBDIR . "/error-dumper/src"],
 		//["Cypress\\Curry", LIBDIR . "/php-curry"],
 	]);
 

phpunit.xml.dist

@@ -6,6 +6,7 @@
 	bootstrap="./test/bootstrap.php"
 	cacheTokens="true"
 	checkForUnintentionallyCoveredCode="true"
+	beStrictAboutCoversAnnotation="true"
 	colors="true"
 	timeoutForMediumTests="3"
 	timeoutForLargeTests="5"
@@ -17,6 +18,8 @@
 			<directory>./test</directory>
 			<exclude>
 				<file>./test/Bootstrap.php</file>
+				<directory>./test/_files</directory>
+				<directory>./test/Laura/_files</directory>
 			</exclude>
 		</testsuite>
 	</testsuites>

src/F.php

@@ -33,7 +33,7 @@ class F
 	 * In case you're tired of writing call_user_func_array
 	 * May be removed in the future, because it's quite meh
 	 */
-	public static function apply(callable $func, $args)
+	public static function apply(callable $func, $args=[])
 	{
 		return call_user_func_array($func, $args);
 	}
@@ -95,6 +95,13 @@ class F
 		return $param;
 	}
 
+	/**
+	 * Creates a function that returns the given $property of an object
+	 *
+	 * @param string $property Name
+	 *
+	 * @return \Closure Function that returns $property from argument
+	 */
 	public static function pick($property)
 	{
 		return function($obj) use ($property) {
@@ -104,6 +111,19 @@ class F
 		};
 	}
 
+	/**
+	 * Creates a function that calls a function depending on a condition
+	 *
+	 * When called, passes its argument to $test and calls either $onTrue or
+	 * $onFalse depending on the return value of $test. $onFalse can be null
+	 * and the function will by default simply return the argument.
+	 *
+	 * @param callable $test    Evaluates its argument and returns bool
+	 * @param callable $onTrue  Called with argument in the true case
+	 * @param callable $onFalse Called with argument in the false case
+	 *
+	 * @return \Closure takes one argument
+	 */
 	public static function conditional($test, $onTrue, $onFalse = null)
 	{
 		return function($subject) use ($test, $onTrue, $onFalse)

src/GlobalWordPress.php

@@ -0,0 +1,47 @@
+<?php
+namespace ITSociaal\Themes\Houtgrutter;
+
+class GlobalWordPress implements WordPressInterface
+{
+	public function avia_append_search_nav(...$args)
+	{
+		return \avia_append_search_nav(...$args);
+	}
+
+	public function avia_get_option(...$args)
+	{
+		return \avia_get_option(...$args);
+	}
+
+	public function get_bloginfo(...$args)
+	{
+		return \get_bloginfo(...$args);
+	}
+
+	public function get_the_post_thumbnail(...$args)
+	{
+		return \get_the_post_thumbnail(...$args);
+	}
+
+	public function has_post_thumbnail(...$args)
+	{
+		return \has_post_thumbnail(...$args);
+	}
+
+	public function load_template(...$args)
+	{
+		return \load_template(...$args);
+	}
+
+	public function shopp(...$args)
+	{
+		return \shopp(...$args);
+	}
+
+	public function wp_nav_menu(...$args)
+	{
+		return \wp_nav_menu(...$args);
+	}
+}
+
+/* vi:set ts=4 sw=4 noet: */