diff --git a/app/Controllers/Contribute.php b/app/Controllers/Contribute.php index cd976775..8fdff2e9 100644 --- a/app/Controllers/Contribute.php +++ b/app/Controllers/Contribute.php @@ -2,7 +2,7 @@ namespace App\Controllers; -use Github\Exception\ExceptionInterface; +use Psr\Http\Client\ClientExceptionInterface; class Contribute extends BaseController { @@ -16,7 +16,9 @@ public function index() // Contributors are already sorted, so grab the first 12 $data['contributors'][$id] = array_slice($contributors, 0, 12); } - } catch (ExceptionInterface $e) { + } catch (ClientExceptionInterface $e) { + log_message('error', '[' . __METHOD__ . '] ' . get_class($e) . ': ' . $e->getMessage()); + $data['contributors'] = null; } diff --git a/app/Controllers/Download.php b/app/Controllers/Download.php index 0bcfe437..c1e01de7 100644 --- a/app/Controllers/Download.php +++ b/app/Controllers/Download.php @@ -2,7 +2,7 @@ namespace App\Controllers; -use Github\Exception\ExceptionInterface; +use Psr\Http\Client\ClientExceptionInterface; class Download extends BaseController { @@ -18,7 +18,9 @@ public function index() 'v3link' => end($releases['framework3'])->download_url, 'v4link' => end($releases['framework4'])->download_url, ]; - } catch (ExceptionInterface $e) { + } catch (ClientExceptionInterface $e) { + log_message('error', '[' . __METHOD__ . '] ' . get_class($e) . ': ' . $e->getMessage()); + $data = [ 'v3name' => 'unknown', 'v4name' => 'unknown', diff --git a/app/Controllers/Home.php b/app/Controllers/Home.php index 610f063e..cd4f63be 100644 --- a/app/Controllers/Home.php +++ b/app/Controllers/Home.php @@ -2,7 +2,7 @@ namespace App\Controllers; -use Github\Exception\ExceptionInterface; +use Psr\Http\Client\ClientExceptionInterface; class Home extends BaseController { @@ -17,7 +17,9 @@ public function index() 'stargazers_count' => number_format($repos['codeigniter4']->stargazers_count), 'forks_count' => number_format($repos['codeigniter4']->forks_count), ]; - } catch (ExceptionInterface $e) { + } catch (ClientExceptionInterface $e) { + log_message('error', '[' . __METHOD__ . '] ' . get_class($e) . ': ' . $e->getMessage()); + $data = [ 'html_url' => 'https://github.com/codeigniter4/CodeIgniter4', 'stargazers_count' => '', diff --git a/app/Views/contribute.php b/app/Views/contribute.php index 5cce03f3..9037a94f 100644 --- a/app/Views/contribute.php +++ b/app/Views/contribute.php @@ -7,7 +7,7 @@
Contribute to CodeIgniter
+Contribute to CodeIgniter
- The CodeIgniter 4 roadmap is explained on our forum. -
-Issues are a quick way to point out a bug. If you find a bug or documentation error in CodeIgniter then please check a few things first: @@ -35,7 +29,7 @@
@@ -47,9 +41,8 @@
- CodeIgniter 3 has its own Github repository. + CodeIgniter 3 has its own GitHub repository.
Security issues should be reported with an email to our security team, rather than being brought up on the forum or - raised as a Github issue, thanks! Read more about responsible disclosure. + raised as a GitHub issue, thanks! Read more about responsible disclosure.
We always need feedback on what works and what does not! Most of the development effort is going into Version 4, - so that is where the need is greatest. If you find something that is definitely a bug, and you are a Github user, - please create a new "issue". If you are not a Github user, or if you are unsure if you have found a bug, then start - a new thread in the CodeIgniter forum Issues section! -
-- CodeIgniter 3 has its own support subforum. + so that is where the need is greatest. If you find something that is definitely a bug, and you are a GitHub user, + please create a new "issue". If you are not a GitHub user, or if you are unsure if you have found a bug, then start + a new thread in the CodeIgniter forum Issues section!
- Every project needs good documentation! The CodeIgniter user guide is part of the Github project (mentioned above), + Every project needs good documentation! The CodeIgniter user guide is part of the GitHub project (mentioned above), and there is always room for more tutorials.
@@ -120,7 +110,7 @@
Suggestions and help with our website, User Guide, and forum design are always welcome! We are working on themes - for each of these, which will be shared in their own Github repository. + for each of these, which will be shared in their own GitHub repository.
- If you would like to get involved in helping to build CodeIgniter4, join us on Github! + If you would like to get involved in helping to build CodeIgniter4, join us on GitHub! A detailed contribution guide is in Contributing to CodeIgniter, that it is properly documented, and that you use the Git-Flow branching model.
- CodeIgniter 3 equivalent link: its repository. + CodeIgniter 3 equivalent link: its repository.
Security issues should be reported with an email to our security team, rather than being brought up on the forum or - raised as a Github issue, thanks! + raised as a GitHub issue, thanks!
- The development action takes place on Github. See the contribute page for more details. + The development action takes place on GitHub. See the contribute page for more details.
- The Github repository is where you can file bug reports (github issues), or where you can submit pull requests - for enhancements to or fixes for framework. Github is *not* for support or help ... use the forum instead. + The GitHub repository is where you can file bug reports (github issues), or where you can submit pull requests + for enhancements to or fixes for framework. GitHub is *not* for support or help ... use the forum instead.
- Github issues are also used for tracking planned and approved enhancements, often tied in to specific releases. + GitHub issues are also used for tracking planned and approved enhancements, often tied in to specific releases.
CodeIgniter 3 diff --git a/app/Views/home.php b/app/Views/home.php index 01039a72..0405210e 100644 --- a/app/Views/home.php +++ b/app/Views/home.php @@ -195,7 +195,7 @@