Skip to content

Commit

Permalink
Merge pull request #2357 from Arhell/upd
Browse files Browse the repository at this point in the history
  • Loading branch information
Jeckerson authored Feb 24, 2022
2 parents b3bb334 + bc1176f commit cc7ecd3
Show file tree
Hide file tree
Showing 24 changed files with 36 additions and 36 deletions.
2 changes: 1 addition & 1 deletion .editorconfig
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# EditorConfig is awesome: http://EditorConfig.org
# EditorConfig is awesome: https://EditorConfig.org

# top-most EditorConfig file
root = true
Expand Down
4 changes: 2 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
# Change Log
All notable changes to this project will be documented in this file.

The format based on [Keep a Changelog](http://keepachangelog.com)
and this project adheres to [Semantic Versioning](http://semver.org).
The format based on [Keep a Changelog](https://keepachangelog.com)
and this project adheres to [Semantic Versioning](https://semver.org).

## [Unreleased]
### Added
Expand Down
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -82,5 +82,5 @@ Phalcon Team
[team]: https://phalcon.io/en-us/team
[issues]: https://github.com/zephir-lang/zephir/issues
[docs]: https://docs.zephir-lang.com
[git rebase]: http://git-scm.com/book/en/Git-Branching-Rebasing
[git rebase]: https://git-scm.com/book/en/Git-Branching-Rebasing
[psr-2]: https://github.com/php-fig/fig-standards/blob/master/accepted/PSR-2-coding-style-guide.md
2 changes: 1 addition & 1 deletion Library/Documentation/Theme.php
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ private function __namespaceTreeHelper(NamespaceHelper $ns)
}

/**
* from : http://stackoverflow.com/questions/2050859/copy-entire-contents-of-a-directory-to-another-using-php.
* from : https://stackoverflow.com/questions/2050859/copy-entire-contents-of-a-directory-to-another-using-php.
*
* @param $src
* @param $dst
Expand Down
4 changes: 2 additions & 2 deletions Library/Expression/Constants.php
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ class Constants
/**
* Reserved ENV Constants.
*
* @see http://www.php.net/manual/ru/reserved.constants.php
* @see https://www.php.net/manual/ru/reserved.constants.php
*
* @var array
*/
Expand Down Expand Up @@ -66,7 +66,7 @@ class Constants
/**
* Magic constants.
*
* @see http://php.net/manual/en/language.constants.predefined.php
* @see https://php.net/manual/en/language.constants.predefined.php
*
* @var array
*/
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ class ArithmeticalBaseOperator extends AbstractOperator
*
* Probably gcc/clang will optimize them without this optimization
*
* @see http://en.wikipedia.org/wiki/Constant_folding
* @see https://en.wikipedia.org/wiki/Constant_folding
*
* @param array $expression
* @param CompilationContext $compilationContext
Expand Down
2 changes: 1 addition & 1 deletion Library/Operators/Bitwise/BitwiseBaseOperator.php
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ class BitwiseBaseOperator extends AbstractOperator
* This tries to perform arithmetical operations
* Probably gcc/clang will optimize them without this optimization.
*
* @see http://en.wikipedia.org/wiki/Constant_folding
* @see https://en.wikipedia.org/wiki/Constant_folding
*
* @param array $expression
* @param CompilationContext $compilationContext
Expand Down
2 changes: 1 addition & 1 deletion Library/Optimizers/FunctionCall/IsScalarOptimizer.php
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
*
* Optimizes calls to 'is_scalar' using internal function
*
* @see http://php.net/manual/en/function.is-scalar.php
* @see https://php.net/manual/en/function.is-scalar.php
*/
class IsScalarOptimizer extends OptimizerAbstract
{
Expand Down
2 changes: 1 addition & 1 deletion Library/Optimizers/FunctionCall/JoinOptimizer.php
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
namespace Zephir\Optimizers\FunctionCall;

/**
* @see http://php.net/manual/en/function.join.php
* @see https://php.net/manual/en/function.join.php
*
* Optimizes calls to 'join' using ImplodeOptimizer via it is an alias
*/
Expand Down
2 changes: 1 addition & 1 deletion Library/Passes/LocalContextPass.php
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
* mutations is relative, since assignments inside cycles/loops may perform a n-number of
* mutations
*
* @see http://en.wikipedia.org/wiki/Escape_analysis
* @see https://en.wikipedia.org/wiki/Escape_analysis
*/
class LocalContextPass
{
Expand Down
8 changes: 4 additions & 4 deletions WINDOWS.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,24 +7,24 @@ PHP-Version requirements are marked using `[ ]`

## Software Requirements [PHP 5.5 or later]

- [Install Visual Studio 2012 Express](http://www.microsoft.com/en-US/download/details.aspx?id=34673)
- [Install Visual Studio 2012 Express](https://www.microsoft.com/en-US/download/details.aspx?id=34673)
(You should start it and activate it)

## Software Requirements General

- [Install PHP (NTS)](http://windows.php.net/download/)
- [Install PHP (NTS)](https://windows.php.net/download/)
- Download and extract it
- Make sure it is in the PATH, as for example below:
```cmd
setx path "%path%;c:\path-to-php\"
```
- [Install PHP SDK for PHP 5.6](http://windows.php.net/downloads/php-sdk/)(Currently `php-sdk-binary-tools-20110915.zip` is the newest)
- [Install PHP SDK for PHP 5.6](https://windows.php.net/downloads/php-sdk/)(Currently `php-sdk-binary-tools-20110915.zip` is the newest)
- [Install PHP SDK for PHP 7.0+](https://github.com/Microsoft/php-sdk-binary-tools/releases)
```cmd
setx php_sdk "c:\path-to-php-sdk"
```

- [Download PHP Developer Pack(NTS!):***php-devel-pack-?.?.?-Win??-VC??-x??.zip***](http://windows.php.net/downloads/releases/)
- [Download PHP Developer Pack(NTS!):***php-devel-pack-?.?.?-Win??-VC??-x??.zip***](https://windows.php.net/downloads/releases/)
(or build it yourself with `--enable-debug --disable-zts` and `nmake build-devel` or just `nmake snap` by using the PHP-SDK)
```cmd
setx php_devpack "c:\path-to-extracted-devpack"
Expand Down
2 changes: 1 addition & 1 deletion ext/stub/emptytest.zep.c

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion ext/stub/fannkuch.zep.c

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion ext/stub/regexdna.zep.c

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion ext/stub/spectralnorm.zep.c

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 5 additions & 5 deletions prototypes/gd.php
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
/**
* Retrieve information about the currently installed GD library.
*
* @see http://www.php.net/manual/en/function.gd-info.php
* @see https://www.php.net/manual/en/function.gd-info.php
*
* @return array
*/
Expand Down Expand Up @@ -170,7 +170,7 @@ function imageantialias($image, $enabled)
/**
* Draws an arc.
*
* @see http://www.php.net/manual/ru/function.imagearc.php
* @see https://www.php.net/manual/ru/function.imagearc.php
*
* @param resource $image
* @param int $cx
Expand Down Expand Up @@ -357,7 +357,7 @@ function imagecolordeallocate($image, $color)
/**
* Get the index of the specified color.
*
* @see http://www.php.net/manual/ru/function.imagecolorexact.php
* @see https://www.php.net/manual/ru/function.imagecolorexact.php
*
* @param resource $image
* @param int $red
Expand Down Expand Up @@ -394,7 +394,7 @@ function imagecolorexactalpha($image, $red, $green, $blue, $alpha)
/**
* Makes the colors of the palette version of an image more closely match the true color version.
*
* @see http://www.php.net/manual/ru/function.imagecolormatch.php
* @see https://www.php.net/manual/ru/function.imagecolormatch.php
*
* @param resource $image1
* @param resource $image2
Expand All @@ -410,7 +410,7 @@ function imagecolormatch($image1, $image2)
/**
* Get the index of the specified color or its closest possible alternative.
*
* @see http://www.php.net/manual/ru/function.imagecolorresolve.php
* @see https://www.php.net/manual/ru/function.imagecolorresolve.php
*
* @param resource $image
* @param int $red
Expand Down
2 changes: 1 addition & 1 deletion prototypes/memcache.php
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
/**
* Class Memcache.
*
* @see http://se2.php.net/manual/en/class.memcache.php
* @see https://se2.php.net/manual/en/class.memcache.php
*/
class memcache
{
Expand Down
2 changes: 1 addition & 1 deletion stub/emptytest.zep
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
namespace Stub;

/**
* @link http://ru2.php.net/empty
* @link https://ru2.php.net/empty
*/
class EmptyTest
{
Expand Down
2 changes: 1 addition & 1 deletion stub/regexdna.zep
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ namespace Stub;
/**
* RegexDNA
*
* @see http://www.haskell.org/haskellwiki/Shootout/Regex_DNA
* @see https://www.haskell.org/haskellwiki/Shootout/Regex_DNA
*/
class RegexDNA
{
Expand Down
2 changes: 1 addition & 1 deletion stub/spectralnorm.zep
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ namespace Stub;
/**
* SpectralNorm
*
* @see http://mathworld.wolfram.com/SpectralNorm.html
* @see https://mathworld.wolfram.com/SpectralNorm.html
*/
class SpectralNorm
{
Expand Down
2 changes: 1 addition & 1 deletion templates/Api/themes/zephir/static/zephir-theme.css
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/* http://meyerweb.com/eric/tools/css/reset/
/* https://meyerweb.com/eric/tools/css/reset/
v2.0 | 20110126
License: none (public domain)
*/
Expand Down
2 changes: 1 addition & 1 deletion tests/fixtures/lifecycle/.editorconfig
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# EditorConfig is awesome: http://EditorConfig.org
# EditorConfig is awesome: https://EditorConfig.org

[*.{c,h}]
trim_trailing_whitespace = false
2 changes: 1 addition & 1 deletion tests/fixtures/typehints/.editorconfig
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# EditorConfig is awesome: http://EditorConfig.org
# EditorConfig is awesome: https://EditorConfig.org

[*.{c,h}]
trim_trailing_whitespace = false
8 changes: 4 additions & 4 deletions tests/sharness/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,9 @@ Here's an example of parallel testing powered by a recent version of [prove][:3:
```shell
$ prove --jobs 15 ./t[0-9]*.sh

./t0003-init-errors.sh .. ok
./t0002-generate.sh ..... ok
./t0001-compile.sh ...... ok
./t0003-init-errors.sh .. ok
./t0002-generate.sh ..... ok
./t0001-compile.sh ...... ok
All tests successful.
Files=3, Tests=6, 30 wallclock secs ( 0.04 usr 0.01 sys + 33.47 cusr 9.56 csys = 43.08 CPU)
Result: PASS
Expand Down Expand Up @@ -55,5 +55,5 @@ $ ./t0001-compile.sh -v -i
```

[:1:]: https://github.com/mlafeldt/sharness/
[:2:]: http://testanything.org
[:2:]: https://testanything.org
[:3:]: https://linux.die.net/man/1/prove

0 comments on commit cc7ecd3

Please sign in to comment.