From f59346bc6f543799317501c6092fce2c7fecf7f8 Mon Sep 17 00:00:00 2001 From: Vahid Amiri Motlagh Date: Wed, 6 Jul 2016 22:55:32 +0430 Subject: [PATCH] Added .gitattributes, Updated Readme --- .gitignore | 56 +++++++++++++++++++++++++++ .idea/workspace.xml | 94 +++++++++++++++++++++++---------------------- README.md | 8 ++-- 3 files changed, 109 insertions(+), 49 deletions(-) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..fc3b212 --- /dev/null +++ b/.gitignore @@ -0,0 +1,56 @@ + +# Created by https://www.gitignore.io/api/phpstorm + +### PhpStorm ### +# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio and Webstorm +# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839 + +# User-specific stuff: +.idea/workspace.xml +.idea/tasks.xml +.idea/dictionaries +.idea/vcs.xml +.idea/jsLibraryMappings.xml + +# Sensitive or high-churn files: +.idea/dataSources.ids +.idea/dataSources.xml +.idea/dataSources.local.xml +.idea/sqlDataSources.xml +.idea/dynamic.xml +.idea/uiDesigner.xml + +# Gradle: +.idea/gradle.xml +.idea/libraries + +# Mongo Explorer plugin: +.idea/mongoSettings.xml + +## File-based project format: +*.iws + +## Plugin-specific files: + +# IntelliJ +/out/ + +# mpeltonen/sbt-idea plugin +.idea_modules/ + +# JIRA plugin +atlassian-ide-plugin.xml + +# Crashlytics plugin (for Android Studio and IntelliJ) +com_crashlytics_export_strings.xml +crashlytics.properties +crashlytics-build.properties +fabric.properties + +### PhpStorm Patch ### +# Comment Reason: https://github.com/joeblau/gitignore.io/issues/186#issuecomment-215987721 + +# *.iml +# modules.xml +# .idea/misc.xml +# *.ipr \ No newline at end of file diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 8295831..54f7f04 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -2,14 +2,8 @@ - - - - - - + - @@ -30,31 +24,7 @@ - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + - + @@ -191,13 +187,21 @@ - - + + + + + + + + + + \ No newline at end of file diff --git a/README.md b/README.md index 1d1c11d..1ada53c 100644 --- a/README.md +++ b/README.md @@ -7,7 +7,7 @@ Jalali, also known as Shamsi or Hijri Shamsi is the Iranian calendar system. `jDateTimePlus` 1.0.0 is based on `jDateTime` 2.2.0 -This package is a fork based on jDateTime by Sallar Kaboli. In this fork, I replaced Jalali to Gregorian and vice versa methods with new ones based on jdf 2.60. Also replaced the `mktime` method with a new one because the older version gave wrong results. I also fixed some of the phpdocs and introduced new methods. This package is best used with a higher abstraction such as `EasyDateTime`. +This package is a fork based on jDateTime by Sallar Kaboli. In this fork, I replaced Jalali to Gregorian and vice versa methods with new ones based on jdf 2.60. Also replaced the `mktime` method with a new one because the older version gave wrong results. I also fixed some of the phpdocs and introduced new methods. This package is best used with a higher abstraction such as `EasyDateTime`. PHP's default `date` function does not support years higher than 2038, so the `DateTime` class was introduced in PHP5 to solve this problem and provide more sophisticated date methods. Iranian users have been using an old `jdate` function to convert Gregorian date to the Jalali equivalent, which is completely based on the old php `date` function so its pretty much out-dated. @@ -23,14 +23,14 @@ You can install this package using [composer](https://getcomposer.org). Add this ``` "require": { - "sallar/jdatetime": "dev-master" + "vsg24/jdatetimeplus": "dev-master" } ``` or if you prefer command line, change directory to project root and: ``` -php composer.phar require "sallar/jdatetime":"dev-master" +php composer.phar require "vsg24/jdatetimeplus":"dev-master" ``` ##Manual Installation @@ -43,7 +43,7 @@ Get a copy of package source code. You can do this in two ways: After getting a copy of source code, it is enough to include `jdatetime.class.php` where you need to use it. ```php -require_once 'path/to/source/jdatetime.class.php'; +require_once 'path/to/source/jdatetimeplus.class.php'; ``` #Examples