From 9e1a27c02da16941ded41b305fc3f21b739e0453 Mon Sep 17 00:00:00 2001
From: xy2z <xyzbk89@gmail.com>
Date: Sat, 17 Feb 2024 12:40:00 +0100
Subject: [PATCH] Fix #30 + Minor fixes

---
 .gitattributes          |   1 +
 CONTRIBUTING.md         |  23 --------------
 README.md               |  65 ++--------------------------------------
 capro                   |   7 ++++-
 capro-logo.png          | Bin 2560 -> 0 bytes
 src/capro_bootstrap.php |   2 +-
 6 files changed, 11 insertions(+), 87 deletions(-)
 delete mode 100644 CONTRIBUTING.md
 delete mode 100644 capro-logo.png

diff --git a/.gitattributes b/.gitattributes
index c0fc819..7c90463 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,3 +1,4 @@
+# This file is not really needed as the dev branch is not released as a package
 /capro-logo.png           export-ignore
 /README.md                export-ignore
 /.gitignore               export-ignore
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
deleted file mode 100644
index 8bccf7f..0000000
--- a/CONTRIBUTING.md
+++ /dev/null
@@ -1,23 +0,0 @@
-# Contributing to Capro
-
-Pull Requests are welcome!
-
-- If you want to work on a completely new feature please make an issue beforehand to discuss if it fits the projects scope.
-- Use `php-cs-fixer` to follow the coding standard. This can be called automatically in modern editors on file save.
-- Call `vendor\bin\phpstan` to check for errors.
-- Make sure it works with all supported PHP versions (see "Requirements" in the README, or composer.json).
-- When you test the code you should run "php capro <command>" to make sure you are running the correct script.
-
-If you have any questions or notes about contributing, please ask in [Discussions](https://github.com/xy2z/capro/discussions)
-
-
-## Build and Release
-1. Check `box validate` command to validate the box.json.dist file. (should be part of "build.sh" script, fails if not valid)
-1. Make sure the version is bumped in `src/capro_bootstrap.php`
-1. Run `composer build` to build the phar file in the `build` dir.
-1. Test the `build/capro.phar` file.
-1. Run `composer validate` to check the `build/composer.json` file.
-1. Overwrite the `build/capro.phar` file in the master branch, commit and push
-1. Make a new release on GitHub (make sure the version matches the one in `src/capro_bootstrap.php`)
-
-To get back the development composer packages (phpstan, etc.) run `composer install` again.
diff --git a/README.md b/README.md
index eb740fb..bc6e3a2 100644
--- a/README.md
+++ b/README.md
@@ -1,65 +1,6 @@
-<div align="center">
+# Capro - Dev Branch
 
-![capro logo](./capro-logo.png)
+This is the development branch, where the capro.phar file is build from.
 
-Capro is a static-site generator for PHP 8+
+See [CONTRIBUTION](https://github.com/xy2z/capro/blob/master/CONTRIBUTING.md) (in master branch)
 
----
-
-[Quick Setup](#quick-setup) | [Documentation](https://capro.xy2z.io) | [Community](https://github.com/xy2z/capro/discussions) | [Sponsor](https://github.com/sponsors/xy2z)
-
-<p align="center">
-  <a href="https://github.com/xy2z/capro/releases"><img src="https://img.shields.io/github/v/release/xy2z/capro?style=flat-square&include_prereleases&sort=semver"></a>
-  <a href="https://github.com/xy2z/capro/blob/master/LICENSE"><img src="https://img.shields.io/github/license/xy2z/capro?style=flat-square&color=blue"></a>
-  <a href="https://github.com/xy2z/capro/graphs/contributors"><img src="https://img.shields.io/github/contributors/xy2z/capro?style=flat-square"></a>
-  <a href="https://github.com/xy2z/capro/issues?q=is%3Aopen+is%3Aissue+label%3A%22help+wanted%22"><img src="https://img.shields.io/github/issues/xy2z/capro/help%20wanted?label=help%20wanted%20issues&style=flat-square&color=f26222"></a>
-  <a href="https://github.com/xy2z/capro/milestone/1"><img src="https://img.shields.io/github/milestones/progress-percent/xy2z/capro/1?label=alpha%20completion&style=flat-square"></a>
-</p>
-
----
-
-</div>
-
-
-## ⚠ Notice
-
-Capro is currently in [alpha](https://github.com/xy2z/capro/issues/5), please report bugs via [GitHub Issues](https://github.com/xy2z/capro/issues)
-
-
-## About
-
-A PHP static-site generator, using Blade template engine.
-
-Capro is currently in alpha, and is not thoroughly tested for production. Breaking changes might occur during the alpha phase.
-
-
-## Sponsors
-
-Currently none. Sponsor here: https://github.com/sponsors/xy2z
-
-
-## Requirements
-- PHP 8.0+
-- [Composer](https://getcomposer.org/)
-
-
-## Quick Setup
-First install the capro global package
-```bash
-composer global require xy2z/capro:@alpha
-```
-
-Now, you can create new sites using:
-```bash
-capro new demo
-cd demo/public
-php -S localhost:82
-```
-Head over to http://localhost:82 to see your new static Capro site.
-
-Learn more in the **[full documentation site](https://capro.xy2z.io).** (which was build in capro)
-
-
-## Contributing
-
-Pull Requests are welcome! See more in the [Contributing Guide](CONTRIBUTING.md).
diff --git a/capro b/capro
index ad02287..4285311 100644
--- a/capro
+++ b/capro
@@ -22,12 +22,17 @@ require __DIR__ . '/src/capro_bootstrap.php';
 
 // Autoload.php (for box/phar and development of capro)
 if (file_exists(__DIR__ . '/vendor/autoload.php')) {
-	require __DIR__ . '/vendor/autoload.php';
+	require_once __DIR__ . '/vendor/autoload.php';
 } else {
 	echo 'Error: Composer\'s vendor/autoload.php file was not found. (try `composer install`)' . PHP_EOL;
 	exit(1);
 }
 
+// Autoload "client's" autoload.php for their project.
+if (file_exists(CAPRO_SITE_ROOT_DIR . 'vendor/autoload.php')) {
+	require_once CAPRO_SITE_ROOT_DIR . 'vendor/autoload.php';
+}
+
 // Load env (before config)
 if (file_exists(CAPRO_SITE_ROOT_DIR . '.env')) {
 	$dotenv = Dotenv::createImmutable(CAPRO_SITE_ROOT_DIR);
diff --git a/capro-logo.png b/capro-logo.png
deleted file mode 100644
index 38947c466c4884fe86033666d7d704e426bde390..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2560
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
U8gK8OtTrBdn_JdIOTX0r0uliK#sB~S

diff --git a/src/capro_bootstrap.php b/src/capro_bootstrap.php
index 53bf259..ba2fca0 100644
--- a/src/capro_bootstrap.php
+++ b/src/capro_bootstrap.php
@@ -2,7 +2,7 @@
 
 namespace xy2z\Capro;
 
-define('CAPRO_VERSION', '1.0.0-alpha.34');
+define('CAPRO_VERSION', '1.0.0-alpha.35');
 
 // Get root dir of the phar file.
 // Can't use __DIR__ because that could return the .phar file.